angstrom: some more tweaks to images and tasks

diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index 67947b8..e6dc88d 100644 (file)
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -3,10 +3,10 @@ LICENSE = MIT
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 PR = "r1"
 
-PREFERRED_PROVIDER_libgpewidget        = "libgpewidget"
-PREFERRED_PROVIDER_tslib               = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl      = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine     = "libxine-x11"
+PREFERRED_PROVIDER_libgpewidget        ?= "libgpewidget"
+PREFERRED_PROVIDER_tslib               ?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl      ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine     ?= "libxine-x11"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 XSERVER ?= "xserver-kdrive-fbdev"

diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index ec98965..6c9224a 100644 (file)
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,9 +1,12 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r0"
+PR = "r2"
 ALLOW_EMPTY = "1"
 
+BOOTMODULES_RRECOMMENDS ?= ""
+
 PACKAGES = "\
     angstrom-base-depends \
+    angstrom-base-wifi \
     angstrom-x11-base-depends \
     angsgrom-gpe-task-base \
     angstrom-gpe-task-settings \
@@ -15,19 +18,29 @@ PACKAGES = "\
     angstrom-task-sectest"
 
 RDEPENDS_angstrom-base-depends = "\
-    base-files \
+    base-files keymaps \
     base-passwd tinylogin \ 
     busybox \
     udev \
     sysvinit initscripts sysvinit-pidof \
     netbase \
-    angstrom-version \ 
+    angstrom-version \
+    ipkg \
     "
 
 RRECOMMENDS_angstrom-base-depends = "\
         ${BOOTMODULES_RRECOMMENDS} \
        "
 
+RDEPENDS_angstrom-base-wifi = "\
+    hostap-utils \
+    hostap-conf \
+    prism3-support \
+    prism3-firmware \
+    acx-firmware \
+    wireless-tools \
+    wpa-supplicant \
+    "
 
 RDEPENDS_angstrom-x11-base-depends := "\
     diet-x11 \