============================================================
--- conf/distro/angstrom-2007.1.conf    c6bbfa10816eda24513e92b21827c75003bb4daa
+++ conf/distro/angstrom-2007.1.conf    0a5bb2dfc8fa2fae16c265099133887be690d077
@@ -8,7 +8,7 @@ DISTRO_VERSION = "2007.9-test-${DATE}"

 #DISTRO_VERSION = "2007.9"
 DISTRO_VERSION = "2007.9-test-${DATE}"
-DISTRO_REVISION = "46"
+DISTRO_REVISION = "47"

 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
@@ -224,7 +224,6 @@ EXTRA_STUFF ?= ""


 # Angstrom want to ship some extra stuff. This should be moved into task-base eventually
-# contains ipkg specific stuff as well :(

 #work around a bitbake bug where mtd-utils-native isn't created so do_rootfs fails
 DISTRO_EXTRA_DEPENDS += " \
@@ -235,7 +234,6 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
     angstrom-version \
-    ipkg ipkg-collateral \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
============================================================
--- conf/distro/include/angstrom.inc    fbec2661b476213454b69adc6d89a7b5be329d4d
+++ conf/distro/include/angstrom.inc    6de4440df25072408b257e2a3772d511dd952ea4
@@ -266,5 +266,5 @@ SEPPUKU_COMPONENT    = "build"


 # We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "ipkg nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES_nslu2 = "ipkg nfs smbfs alsa bluetooth ext2 usbhost pci"
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
-DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
============================================================
--- packages/tasks/task-base.bb 1a67a9902fc957b26de1621d69f747dac26ee6e2
+++ packages/tasks/task-base.bb dc60bb948d1371358c15a13bac6e12a8028a55b5
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r45"
+PR = "r47"

 inherit task

@@ -27,13 +27,18 @@ PACKAGES = ' \
             task-base-usbgadget \
             task-base-usbhost \
             task-base-wifi \
+            task-base-uboot \
+            task-base-redboot \
+            task-base-apex \
             \
+            task-base-ipkg \
             task-base-cramfs \
             task-base-ipsec \
             task-base-ipv6 \
             task-base-nfs \
             task-base-ppp \
             task-base-smbfs \
+            task-base-raid \
            \
             ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
            '
@@ -96,7 +101,9 @@ RDEPENDS_task-base = "\
     ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
     \
+    ${@base_contains('DISTRO_FEATURES', 'ipkg', 'task-base-ipkg', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \
@@ -166,6 +173,9 @@ RRECOMMENDS_task-base-kernel26 = "\
     kernel-module-rtc-sysfs \
     kernel-module-rtc-sa1100"

+RDEPENDS_task-base-ipkg = "\
+    ipkg ipkg-collateral"
+
 RDEPENDS_task-base-keyboard = "\
     keymaps"

@@ -298,6 +308,9 @@ RDEPENDS_task-base-redboot = "\
 RDEPENDS_task-base-redboot = "\
     fis"

+RDEPENDS_task-base-apex = "\
+    apex-env"
+
 RDEPENDS_task-base-ppp = "\
     ppp \
     ppp-dialin"