angstrom: start removing overlap between task-base and task-angstrom

diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index b977343..5a732c6 100644 (file)
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 PR = "r2"
 
 DEPENDS = "task-angstrom task-base"
-RDEPENDS = "task-base-core-default angstrom-base-depends"
+RDEPENDS = "task-base-core-default task-base angstrom-base-depends"
 
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""

diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index 470ceeb..c603e69 100644 (file)
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -18,6 +18,7 @@ DEPENDS = "task-angstrom task-base"
 RDEPENDS = "\
     ${XSERVER} \
     task-base-core-default \
+    task-base \
     angstrom-base-depends \
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \

diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index 9f31f0b..473d91d 100644 (file)
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r19"
+PR = "r20"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -29,7 +29,6 @@ RDEPENDS_angstrom-base-depends = "\
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
     ${PCMCIA_MANAGER} \
-    angstrom-base-wifi \
 "
 
 RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware "
@@ -44,24 +43,3 @@ RRECOMMENDS_angstrom-base-depends = "\
     kernel-module-af-packet \
 "
 
-RDEPENDS_angstrom-base-wifi = "\
-    hostap-utils \
-    hostap-conf \
-    prism3-support \
-    prism3-firmware \
-    wireless-tools \
-    wpa-supplicant \
-"
-
-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 \
-"