angstrom: fix typo in linux-libc-headers PV

1 files changed, 22 insertions, 27 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 6722addad7..88de5c9fd1 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -114,7 +114,7 @@ PREFERRED_VERSION_gcc-cross ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
 PREFERRED_VERSION_binutils ?= "2.17"
 PREFERRED_VERSION_binutils-cross ?= "2.17"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.18+2.6.19-rc1"
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 
@@ -139,20 +139,8 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
 PREFERRED_VERSION_hostap-modules ?= "0.4.7"
 
 #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
-# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad
+# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad
 
-#### Bootstrap options ####
-
-PCMCIA_MANAGER_c7x0 = "pcmciautils"
-PCMCIA_MANAGER_akita = "pcmciautils"
-PCMCIA_MANAGER_spitz = "pcmciautils"
-PCMCIA_MANAGER_tosa = "pcmciautils"
-PCMCIA_MANAGER_poodle = "pcmciautils"
-PCMCIA_MANAGER_nokia770 = "pcmciautils"
-PCMCIA_MANAGER_h2200 = "pcmciautils"
-PCMCIA_MANAGER_h4000 = "pcmciautils"
-PCMCIA_MANAGER_h6300 = "pcmciautils"
-PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
 
 # add altboot to compatible models, will be replaced with angstrom-bootmanager
 #EXTRA_STUFF_append_c7x0 = "altboot"
@@ -161,20 +149,27 @@ PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
 #EXTRA_STUFF_append_poodle = "altboot"
 #EXTRA_STUFF_append_tosa = "altboot"
 
-### GPE section ###
 
-#Install libgtkinput in devices without a keyboard
-GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput"
-GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput"
-GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput"
-GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput"
-GPE_EXTRA_INSTALL_append_simpad =  " libgtkinput" 
-GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"
+# do some task-base stuff here
+
+# We want to ship extra debug utils in the rootfs when doing a debug build 
+DEBUG_APPS ?= ""
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate strace gdb procps",d)}'
+
+#this should go away soon
+EXTRA_STUFF ?= ""
 
-#As soon as a kill switch is in place we can add it to devices with a keyboard
-#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput"
-#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput"
-#GPE_EXTRA_INSTALL_append_akita = " libgtkinput"
-#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput"
 
+# Angstrom want to ship some extra stuff. This should be moved into task-base eventually
+DISTRO_EXTRA_RDEPENDS = "\
+    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 \
+    ${EXTRA_STUFF} \
+    ${DEBUG_APPS} \
+    "