[oe-commits] org.oe.dev angstrom: start removing overlap between task-base and task-angstrom

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c2533135e6c9a65bc8f3066e9b57c4c4bd61a794
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c2533135e6c9a65bc8f3066e9b57c4c4bd61a794
Files:
1
packages/angstrom/angstrom-bootstrap-image.bb
packages/angstrom/angstrom-gpe-image.bb
packages/angstrom/task-angstrom.bb
Diffs:

#
# mt diff -r1e38cb0e9f5456f65b1b885a0fa78426614268b7 -rc2533135e6c9a65bc8f3066e9b57c4c4bd61a794
#
# 
# 
# patch "packages/angstrom/angstrom-bootstrap-image.bb"
#  from [87be965a8e0732eba95d746e6f0a4b715e16da29]
#    to [d41aab22b3e0cfd176d82d3802dc761488721cc6]
# 
# patch "packages/angstrom/angstrom-gpe-image.bb"
#  from [81bcbcb33542e9b4b1dcec5b76103dfa6e6a9c8f]
#    to [4e7cd9d52636aa8dbef32434ec121660fd5bc480]
# 
# patch "packages/angstrom/task-angstrom.bb"
#  from [3ddfcc23dbb0615f4c5036ec539cb483bb596727]
#    to [7d16a50943e3850a04f09bc07ccb1233b06e4222]
# 
============================================================
--- packages/angstrom/angstrom-bootstrap-image.bb	87be965a8e0732eba95d746e6f0a4b715e16da29
+++ packages/angstrom/angstrom-bootstrap-image.bb	d41aab22b3e0cfd176d82d3802dc761488721cc6
@@ -1,10 +1,10 @@ DEPENDS = "task-angstrom task-base"
 #Angstrom bootstrap image
 LICENSE = MIT
 MAINTAINER = "Koen Kooi <koen at 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 = ""
============================================================
--- packages/angstrom/angstrom-gpe-image.bb	81bcbcb33542e9b4b1dcec5b76103dfa6e6a9c8f
+++ packages/angstrom/angstrom-gpe-image.bb	4e7cd9d52636aa8dbef32434ec121660fd5bc480
@@ -18,6 +18,7 @@ RDEPENDS = "\
 RDEPENDS = "\
     ${XSERVER} \
     task-base-core-default \
+    task-base \
     angstrom-base-depends \
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \
============================================================
--- packages/angstrom/task-angstrom.bb	3ddfcc23dbb0615f4c5036ec539cb483bb596727
+++ packages/angstrom/task-angstrom.bb	7d16a50943e3850a04f09bc07ccb1233b06e4222
@@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Ang
 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 \
-"