angstrom-2007.1.conf: add some extra utils to task-base

angstrom-bootstrap-image: don't depend on task-angstrom
angstrom-gpe-image: don't depend on task-angstrom
task-angstrom-x11: don't depend on task-angstrom
task-angstrom: die, you have been replaced by task-base

5 files changed, 13 insertions, 57 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 646bbd0f75..6722addad7 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -16,14 +16,14 @@ DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 
 FEED_URIS += " \
-		base##${ANGSTROM_URI}/unstable/feed/base \
-		perl##${ANGSTROM_URI}/unstable/feed/perl \
-		python##${ANGSTROM_URI}/unstable/feed/python \
-		debug##${ANGSTROM_URI}/unstable/feed/debug \
-		${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}"
-#        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
-#        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
-#        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
+		base##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/base \
+		perl##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/perl \
+		python##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/python \
+		debug##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/debug \
+		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}"
+#        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/base \
+#        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/machine/${MACHINE} \
+#        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/updates"
 
 #SRCDATE = "20060630"
 #SRCDATE_handhelds-pxa-2.6 = "20060622"
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index 5da104aa18..eb01bd53ec 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -2,8 +2,8 @@
 LICENSE = MIT
 PR = "r2"
 
-DEPENDS = "task-angstrom task-base"
-RDEPENDS = "task-base-core-default task-base angstrom-base-depends"
+DEPENDS = "task-base"
+RDEPENDS = "task-base-core-default task-base"
 
 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 25e7a80835..ab632f91a9 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -1,6 +1,6 @@
 #Angstrom GPE image
 LICENSE = MIT
-PR = "r3"
+PR = "r4"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
 PREFERRED_PROVIDER_tslib 		?= "tslib"
@@ -13,12 +13,11 @@ XSERVER ?= "xserver-kdrive-fbdev"
 
 export IMAGE_BASENAME = "gpe-image"
 
-DEPENDS = "task-angstrom task-base"
+DEPENDS = "task-base"
 RDEPENDS = "\
     ${XSERVER} \
     task-base-core-default \
     task-base \
-    angstrom-base-depends \
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \
     angstrom-gpe-task-settings \
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index 2e5d55d727..62e468a014 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,11 +1,9 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r19"
+PR = "r20"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-DEPENDS = "task-angstrom"
-
 PACKAGES = "\
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
deleted file mode 100644
index 3ad70e2129..0000000000
--- a/packages/angstrom/task-angstrom.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r23"
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-BOOTMODULES_RRECOMMENDS ?= ""
-DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate strace gdb procps",d)}'
-EXTRA_STUFF ?= ""
-PCMCIA_MANAGER ?= "pcmciautils"
-
-PACKAGES = "\
-    angstrom-base-depends \
-    angstrom-base"
-
-RDEPENDS_angstrom-base-depends = "\
-    update-modules module-init-tools modutils-initscripts \
-    sysvinit initscripts sysvinit-pidof \
-    psplash \
-    netbase dropbear \
-    angstrom-version \
-    ipkg ipkg-collateral \
-    util-linux-mount util-linux-umount \
-    procps \
-    ${EXTRA_STUFF} \
-    ${DEBUG_APPS} \
-"
-
-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-af-packet \
-"
-