summaryrefslogtreecommitdiff
path: root/packages/angstrom
diff options
context:
space:
mode:
Diffstat (limited to 'packages/angstrom')
-rw-r--r--packages/angstrom/angstrom-altboot-console-image.bb6
-rw-r--r--packages/angstrom/angstrom-altboot-x11-image.bb4
-rw-r--r--packages/angstrom/angstrom-console-image.bb11
-rw-r--r--packages/angstrom/angstrom-gateway-image.bb23
-rw-r--r--packages/angstrom/angstrom-gpe-task-apps.bb22
-rw-r--r--packages/angstrom/angstrom-gpe-task-base.bb38
-rw-r--r--packages/angstrom/angstrom-gpe-task-game.bb12
-rw-r--r--packages/angstrom/angstrom-gpe-task-pim.bb12
-rw-r--r--packages/angstrom/angstrom-gpe-task-settings.bb15
-rw-r--r--packages/angstrom/angstrom-mokogateway-image.bb25
-rw-r--r--packages/angstrom/angstrom-ohand-task-pim.bb10
-rw-r--r--packages/angstrom/angstrom-task-office.bb11
-rw-r--r--packages/angstrom/angstrom-task-printing.bb8
-rw-r--r--packages/angstrom/angstrom-task-sectest.bb17
-rw-r--r--packages/angstrom/angstrom-x11-base-depends.bb16
-rw-r--r--packages/angstrom/angstrom-x11-image.bb9
-rw-r--r--packages/angstrom/task-angstrom-e.bb27
-rw-r--r--packages/angstrom/task-angstrom-x11.bb130
18 files changed, 238 insertions, 158 deletions
diff --git a/packages/angstrom/angstrom-altboot-console-image.bb b/packages/angstrom/angstrom-altboot-console-image.bb
new file mode 100644
index 0000000000..32a1564afe
--- /dev/null
+++ b/packages/angstrom/angstrom-altboot-console-image.bb
@@ -0,0 +1,6 @@
+require angstrom-console-image.bb
+
+ANGSTROM_EXTRA_INSTALL += " altboot "
+
+export IMAGE_BASENAME = "altboot-console-image"
+
diff --git a/packages/angstrom/angstrom-altboot-x11-image.bb b/packages/angstrom/angstrom-altboot-x11-image.bb
new file mode 100644
index 0000000000..ce3fd820c3
--- /dev/null
+++ b/packages/angstrom/angstrom-altboot-x11-image.bb
@@ -0,0 +1,4 @@
+require angstrom-x11-image.bb
+
+ANGSTROM_EXTRA_INSTALL += " altboot "
+export IMAGE_BASENAME = "altboot-x11-image"
diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb
index 8bd0fe07e7..b662109a3c 100644
--- a/packages/angstrom/angstrom-console-image.bb
+++ b/packages/angstrom/angstrom-console-image.bb
@@ -1,13 +1,16 @@
#Angstrom bootstrap image
LICENSE = "MIT"
-PR = "r4"
+PR = "r8"
ANGSTROM_EXTRA_INSTALL ?= ""
-DEPENDS = "task-base"
-RDEPENDS = "task-base-core-default \
- task-base \
+DEPENDS = "task-base-extended \
+ ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
+ "
+
+RDEPENDS = "task-base-extended \
${ANGSTROM_EXTRA_INSTALL} \
+ ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
"
export IMAGE_BASENAME = "console-image"
diff --git a/packages/angstrom/angstrom-gateway-image.bb b/packages/angstrom/angstrom-gateway-image.bb
new file mode 100644
index 0000000000..aeca221d3d
--- /dev/null
+++ b/packages/angstrom/angstrom-gateway-image.bb
@@ -0,0 +1,23 @@
+#Angstrom gateway image
+#gives you a gateway with SMB, ssh and dnsmasqs
+LICENSE = "MIT"
+PR = "r0"
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+RDEPENDS = "task-boot \
+ ${DISTRO_SSH_DAEMON} \
+ iptables \
+ samba swat \
+ dnsmasq \
+# vsftpd \
+ angstrom-version \
+ "
+
+export IMAGE_BASENAME = "gateway-image"
+export IMAGE_LINGUAS = ""
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+inherit image
+
diff --git a/packages/angstrom/angstrom-gpe-task-apps.bb b/packages/angstrom/angstrom-gpe-task-apps.bb
new file mode 100644
index 0000000000..37a6ed98c3
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-apps.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS = "\
+ gpe-edit \
+ gpe-gallery \
+ gpe-calculator \
+ gpe-clock \
+ gpe-plucker \
+ gpe-terminal \
+ gpe-watch \
+ gpe-what \
+ matchbox-panel-hacks \
+ ${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
+ gpe-soundbite \
+ ${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
+ gpe-scap \
+ gpe-windowlist"
+
diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb
new file mode 100644
index 0000000000..c931d9d1e4
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-base.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS = "\
+ matchbox \
+ matchbox-panel-hacks \
+ xcursor-transparent-theme \
+ rxvt-unicode \
+ gpe-terminal \
+ matchbox-keyboard \
+ gpe-theme-clearlooks \
+ xst \
+ xhost \
+ xrdb \
+ gpe-soundserver \
+ gpe-dm \
+ gpe-login \
+ gpe-session-scripts \
+ gpe-icons \
+ gpe-confd \
+ gpe-autostarter \
+ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
+ suspend-desktop \
+ teleport \
+ xauth \
+ gdk-pixbuf-loader-png \
+ gdk-pixbuf-loader-xpm \
+ gdk-pixbuf-loader-jpeg \
+ pango-module-basic-x \
+ pango-module-basic-fc \
+ ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \
+ "
+
diff --git a/packages/angstrom/angstrom-gpe-task-game.bb b/packages/angstrom/angstrom-gpe-task-game.bb
new file mode 100644
index 0000000000..09a47f6a26
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-game.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ gpe-go \
+ gpe-lights \
+ gpe-othello \
+ gpe-tetris \
+ gsoko \
+# xdemineur \
+"
diff --git a/packages/angstrom/angstrom-gpe-task-pim.bb b/packages/angstrom/angstrom-gpe-task-pim.bb
new file mode 100644
index 0000000000..8e9d0d4f31
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-pim.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ gpe-timesheet \
+ gpe-todo \
+ gpe-calendar \
+ gpe-contacts \
+ gpesyncd"
+
+
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
new file mode 100644
index 0000000000..c79c068cbd
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ matchbox-panel-manager \
+ gpe-su \
+ gpe-conf \
+ gpe-package \
+ gpe-shield \
+ gpe-taskmanager \
+ keylaunch \
+ minilite \
+ minimix \
+ xmonobut"
diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb
index 80673f61ec..624274de37 100644
--- a/packages/angstrom/angstrom-mokogateway-image.bb
+++ b/packages/angstrom/angstrom-mokogateway-image.bb
@@ -1,32 +1,17 @@
#Angstrom moko gateway image
# tries to be a companion for openmoko based phones
LICENSE = "MIT"
-PR = "r0"
+PR = "r2"
ANGSTROM_EXTRA_INSTALL ?= ""
DEPENDS = "task-base"
-RDEPENDS = "task-base-core-default \
- task-base \
+RDEPENDS = " \
+ task-boot \
+ task-base-bluetooth \
bluez-utils \
- blue-probe \
+ blueprobe \
"
-RRECOMMENDS = " \
- kernel-module-bluetooth \
- kernel-module-l2cap \
- kernel-module-rfcomm \
- kernel-module-hci-vhci \
- kernel-module-bnep \
- kernel-module-hidp \
- kernel-module-hci-uart \
- kernel-module-sco \
- ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)} \
- "
-
export IMAGE_BASENAME = "mokogateway-image"
export IMAGE_LINGUAS = ""
export PACKAGE_INSTALL = "${RDEPENDS}"
diff --git a/packages/angstrom/angstrom-ohand-task-pim.bb b/packages/angstrom/angstrom-ohand-task-pim.bb
new file mode 100644
index 0000000000..70d52c922f
--- /dev/null
+++ b/packages/angstrom/angstrom-ohand-task-pim.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ dates \
+ contacts \
+ tasks \
+"
+
diff --git a/packages/angstrom/angstrom-task-office.bb b/packages/angstrom/angstrom-task-office.bb
new file mode 100644
index 0000000000..364924995a
--- /dev/null
+++ b/packages/angstrom/angstrom-task-office.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ gnumeric \
+ abiword \
+ imposter \
+ evince \
+ gqview"
+
diff --git a/packages/angstrom/angstrom-task-printing.bb b/packages/angstrom/angstrom-task-printing.bb
new file mode 100644
index 0000000000..2954667192
--- /dev/null
+++ b/packages/angstrom/angstrom-task-printing.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ cups \
+# gnome-cups-manager \
+ "
diff --git a/packages/angstrom/angstrom-task-sectest.bb b/packages/angstrom/angstrom-task-sectest.bb
new file mode 100644
index 0000000000..3142f280f3
--- /dev/null
+++ b/packages/angstrom/angstrom-task-sectest.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r31"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ nmap \
+ ettercap \
+ stunnel \
+ curl \
+# dsniff \
+ prismstumbler \
+# tcpdump \
+ kismet \
+ hydra \
+# thcrut \
+# driftnet \
+ miniclipboard"
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
new file mode 100644
index 0000000000..2eb3a36804
--- /dev/null
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r34"
+ALLOW_EMPTY = "1"
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "virtual/xserver"
+
+RDEPENDS = "\
+ ${XSERVER} \
+ ttf-dejavu-sans \
+ ttf-dejavu-sans-mono \
+ "
+
diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb
index dbb986ae65..83f00cce66 100644
--- a/packages/angstrom/angstrom-x11-image.bb
+++ b/packages/angstrom/angstrom-x11-image.bb
@@ -1,6 +1,6 @@
#Angstrom X11 image
LICENSE = "MIT"
-PR = "r5"
+PR = "r11"
PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
PREFERRED_PROVIDER_tslib ?= "tslib"
@@ -8,7 +8,9 @@ PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-ANGSTROM_EXTRA_INSTALL ?= ""
+ANGSTROM_EXTRA_INSTALL += " \
+ ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+ "
XSERVER ?= "xserver-kdrive-fbdev"
export IMAGE_BASENAME = "x11-image"
@@ -16,8 +18,7 @@ export IMAGE_BASENAME = "x11-image"
DEPENDS = "task-base"
RDEPENDS = "\
${XSERVER} \
- task-base-core-default \
- task-base \
+ task-base-extended \
angstrom-x11-base-depends \
angstrom-gpe-task-base \
angstrom-gpe-task-settings \
diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb
new file mode 100644
index 0000000000..eb9f025743
--- /dev/null
+++ b/packages/angstrom/task-angstrom-e.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r0"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PACKAGES = "\
+ angstrom-e-base-depends \
+ angstrom-e-depends"
+
+RDEPENDS_angstrom-e-base-depends := "\
+ angstrom-x11-base-depends \
+ rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
+ ttf-bitstream-vera \
+ entrance e-wm \
+ glibc-charmap-utf-8 glibc-localedata-i18n"
+#xserver-kdrive-fbdev
+
+RDEPENDS_angstrom-e-depends := "\
+ pango-module-basic-fc \
+ gdk-pixbuf-loader-bmp \
+ gdk-pixbuf-loader-gif \
+ gdk-pixbuf-loader-jpeg \
+ gdk-pixbuf-loader-png \
+ gdk-pixbuf-loader-pnm \
+ gdk-pixbuf-loader-xbm \
+ gdk-pixbuf-loader-xpm"
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
deleted file mode 100644
index 490955af9c..0000000000
--- a/packages/angstrom/task-angstrom-x11.bb
+++ /dev/null
@@ -1,130 +0,0 @@
-DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r29"
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PACKAGES = "\
- angstrom-x11-base-depends \
- angstrom-gpe-task-base \
- angstrom-gpe-task-settings \
- angstrom-gpe-task-pim \
- angstrom-gpe-task-apps \
- angstrom-gpe-task-games \
- angstrom-ohand-task-pim \
- angstrom-task-office \
- angstrom-task-printing \
- angstrom-task-sectest"
-
-RDEPENDS_angstrom-x11-base-depends := "\
- virtual/libx11 \
- virtual/xserver \
- ttf-dejavu-sans \
- ttf-dejavu-sans-mono \
- "
-
-RDEPENDS_angstrom-gpe-task-base := "\
- matchbox \
- matchbox-panel-hacks \
- xcursor-transparent-theme \
- rxvt-unicode \
- gpe-terminal \
- matchbox-keyboard \
- gpe-theme-clearlooks \
- xst \
- xhost \
- xrdb \
- gpe-soundserver \
- gpe-dm \
- gpe-login \
- gpe-session-scripts \
- gpe-icons \
- gpe-confd \
- gpe-autostarter \
- ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
- suspend-desktop \
- teleport \
- xauth \
- gdk-pixbuf-loader-png \
- gdk-pixbuf-loader-xpm \
- gdk-pixbuf-loader-jpeg \
- pango-module-basic-x \
- pango-module-basic-fc \
- ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \
- "
-
-RDEPENDS_angstrom-gpe-task-pim := "\
- gpe-timesheet \
- gpe-todo \
- gpe-calendar \
- gpe-contacts \
- gpesyncd"
-
-RDEPENDS_angstrom-ohand-task-pim := "\
- dates \
- contacts \
- tasks \
-"
-
-RDEPENDS_angstrom-gpe-task-settings := "\
- matchbox-panel-manager \
- gpe-su \
- gpe-conf \
- gpe-package \
- gpe-shield \
- gpe-taskmanager \
- minilite \
- minimix \
- xmonobut"
-
-RDEPENDS_angstrom-gpe-task-apps := "\
- gpe-edit \
- gpe-gallery \
- gpe-calculator \
- gpe-clock \
- gpe-plucker \
- gpe-terminal \
- gpe-watch \
- gpe-what \
- matchbox-panel-hacks \
- ${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
- gpe-soundbite \
- ${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
- gpe-scap \
- gpe-windowlist"
-
-RDEPENDS_angstrom-gpe-task-games := "\
- gpe-go \
- gpe-lights \
- gpe-othello \
- gpe-tetris \
- gsoko \
-# xdemineur \
-"
-
-RDEPENDS_angstrom-task-office := "\
- gnumeric \
- abiword \
- imposter \
-# evince \
- gqview"
-
-RDEPENDS_angstrom-task-printing := "\
- cups \
- gnome-cups-manager"
-
-RDEPENDS_angstrom-task-sectest := "\
- nmap \
- ettercap \
- stunnel \
- curl \
-# dsniff \
- prismstumbler \
-# tcpdump \
- kismet \
- hydra \
-# thcrut \
-# driftnet \
- miniclipboard"