merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff

     and c02b3cdfadfa7f433fd5ca7a0ffcb6f329cadbaf

2 files changed, 144 insertions, 123 deletions

diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
new file mode 100644
index 0000000000..55d644bc15
--- /dev/null
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -0,0 +1,118 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r19"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "task-angstrom"
+
+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-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 \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    matchbox-themes-gtk \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    libgtkstylus \
+    libgtkinput \
+    suspend-desktop \
+    teleport \
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
+RDEPENDS_angstrom-gpe-task-pim := "\
+    gpe-timesheet \
+    gpe-todo \
+    gpe-calendar \
+    gpe-contacts \
+    gpesyncd"
+
+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 \
+    gpe-aerial \
+    gpe-soundbite \
+    rosetta \
+    gpe-screenshot \
+    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"
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index c8c84c3e5e..9f31f0b640 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r17"
+PR = "r19"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -12,20 +12,11 @@ PCMCIA_MANAGER ?= "pcmciautils"
 
 PACKAGES = "\
     angstrom-base-depends \
-    angstrom-base-wifi \
-    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-task-office \
-    angstrom-task-printing \
-    angstrom-task-sectest"
+    angstrom-base-wifi "
 
 RDEPENDS_angstrom-base-depends = "\
     base-files keymaps \
-    base-passwd tinylogin \ 
+    base-passwd tinylogin \
     busybox \
     udev \
     update-modules module-init-tools modutils-initscripts \
@@ -33,132 +24,44 @@ RDEPENDS_angstrom-base-depends = "\
     netbase dropbear \
     angstrom-version \
     ipkg ipkg-collateral \
-    wireless-tools \
     tslib-tests tslib-calibrate \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
-    ${PCMCIA_MANAGER} \	
+    ${PCMCIA_MANAGER} \
+    angstrom-base-wifi \
 "
 
 RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware "
-
+RDEPENDS_angstrom-base-depends_append_h4000 = " tiinit acx-firmware "
+RDEPENDS_angstrom-base-depends_append_htcuniversal = " tiinit acx-firmware "
 
 RRECOMMENDS_angstrom-base-depends = "\
-        ${BOOTMODULES_RRECOMMENDS} \
-	kernel-module-evdev \
-	kernel-module-uinput \
-	kernel-module-g-ether \
-	kernel-module-hostap-cs \
-	kernel-module-af-packet \
-	"
+    ${BOOTMODULES_RRECOMMENDS} \
+    kernel-module-evdev \
+    kernel-module-uinput \
+    kernel-module-g-ether \
+    kernel-module-af-packet \
+"
 
 RDEPENDS_angstrom-base-wifi = "\
     hostap-utils \
     hostap-conf \
     prism3-support \
     prism3-firmware \
-    acx-firmware \
     wireless-tools \
     wpa-supplicant \
-    "
-
-RDEPENDS_angstrom-x11-base-depends := "\
-    virtual/libx11 \
-    virtual/xserver \
-    ttf-dejavu-sans \
-    ttf-dejavu-sans-mono \
-    "
-
-RDEPENDS_angstrom-gpe-task-base := "\
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    matchbox-themes-gtk \
-    xst \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    libgtkstylus \
-    libgtkinput \
-    suspend-desktop \
-    teleport \
-    xauth \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-xpm \
-    gdk-pixbuf-loader-jpeg \
-    pango-module-basic-x \
-    pango-module-basic-fc"
-
-RDEPENDS_angstrom-gpe-task-pim := "\
-    gpe-timesheet \
-    gpe-todo \
-    gpe-calendar \
-    gpe-contacts \
-    gpesyncd"
-
-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 \
-    gpe-aerial \
-    gpe-soundbite \
-    rosetta \
-    gpe-screenshot \
-    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"
+RRECOMMENDS_angstrom-base-wifi = "\
+    kernel-module-hostap-cs \
+    kernel-module-orinoco-cs \
+    kernel-module-spectrum-cs \
+    kernel-module-arc4 \
+    kernel-module-michael-mic \
+    kernel-module-aes \
+    kernel-module-ieee80211-crypt-tkip \
+    kernel-module-ieee80211-crypt-wep \
+    kernel-module-ieee80211-crypt \
+    kernel-module-ieee80211-crypt-ccmp \
+"