Updates against mainline OE

git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966

30 files changed, 443 insertions, 393 deletions

diff --git a/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab b/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
index 8c38a5fda2..3dfde917e6 100644
--- a/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
+++ b/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
@@ -4,6 +4,6 @@
 proc            /proc		proc    defaults        0  0
 sys             /sys        sysfs	defaults        0  0
 
-/dev/hda1		/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
+/dev/hda1		/media/cf	auto	defaults,noauto,noatime,exec,suid	0  0
 tmpfs			/var		tmpfs	defaults	0  0
 tmpfs			/media/ram	tmpfs	defaults	0  0
diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb
index e2c1003c58..d63c38ab83 100644
--- a/openembedded/packages/base-files/base-files_3.0.14.bb
+++ b/openembedded/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r40"
+PR = "r41"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/openembedded/packages/binutils/binutils.inc b/openembedded/packages/binutils/binutils.inc
index e544e9ef53..680e579a06 100644
--- a/openembedded/packages/binutils/binutils.inc
+++ b/openembedded/packages/binutils/binutils.inc
@@ -48,14 +48,14 @@ export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
 export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
 export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
 
-export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
-export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CPP_FOR_BUILD = "${BUILD_CPP}"
 export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
 
-export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
 
 do_configure () {
 	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
diff --git a/openembedded/packages/db/db_4.3.27.bb b/openembedded/packages/db/db_4.3.27.bb
index 216fb5714b..518fddee9f 100644
--- a/openembedded/packages/db/db_4.3.27.bb
+++ b/openembedded/packages/db/db_4.3.27.bb
@@ -69,7 +69,7 @@ do_configure() {
 
 do_stage() {
 	# The .h files get installed read-only, the autostage
-	# function just uses cp -a, so do this by hand
+	# function just uses cp -pPR, so do this by hand
 	# Install, for the moment, into include/db4 to avoid
 	# interfering with the db3 headers (which have the same
 	# name).  -I${STAGING_INCDIR}/db4 to use db4, as opposed
@@ -78,7 +78,7 @@ do_stage() {
 	mkdir -p ${STAGE_TEMP}
 	oe_runmake DESTDIR="${STAGE_TEMP}" install_include
 	mkdir -p ${STAGING_INCDIR}/db4
-	cp -af ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
+	cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
 	rm -rf ${STAGE_TEMP}
 	oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
 }
diff --git a/openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb b/openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb
index 0d64e32c1c..48c80864e2 100644
--- a/openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb
+++ b/openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb
@@ -1,6 +1,7 @@
 include gcc-cross_${PV}.bb
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils ${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 PACKAGES = ""
 
diff --git a/openembedded/packages/hostap/hostap-modules-0.3.9/Makefile.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/Makefile.patch
new file mode 100644
index 0000000000..2fc5e9ed4b
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/Makefile.patch
@@ -0,0 +1,11 @@
+--- hostap-driver-0.2.4/Makefile.old	2004-07-31 10:35:50.000000000 +0100
++++ hostap-driver-0.2.4/Makefile	2004-07-31 10:35:56.000000000 +0100
+@@ -51,7 +51,7 @@
+ 
+ VERFILE := $(KERNEL_PATH)/include/linux/version.h
+ KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \
+-	then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \
++	then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \
+ 	else uname -r; fi)
+ KERNELVER := $(shell echo "$(KERNELRELEASE)" | \
+ 	sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/")
diff --git a/openembedded/packages/hostap/hostap-modules-0.3.9/add_event.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/add_event.patch
new file mode 100644
index 0000000000..d5f2a10e86
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/add_event.patch
@@ -0,0 +1,28 @@
+Index: hostap-driver-0.3.7/driver/modules/hostap_cs.c
+===================================================================
+--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c	2005-08-03 17:05:53.000000000 +0100
++++ hostap-driver-0.3.7/driver/modules/hostap_cs.c	2005-08-03 17:07:59.000000000 +0100
+@@ -526,11 +526,13 @@
+ 	dev_list = link;
+ 	client_reg.dev_info = &dev_info;
+ 	client_reg.Attributes = INFO_IO_CLIENT;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13))
+ 	client_reg.EventMask = CS_EVENT_CARD_INSERTION |
+ 		CS_EVENT_CARD_REMOVAL |
+ 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
+ 		CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
+ 	client_reg.event_handler = &prism2_event;
++#endif
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+ 	ret = pcmcia_register_client(&link->handle, &client_reg);
+@@ -913,6 +915,9 @@
+ 		.name	= "hostap_cs",
+ 	},
+ 	.attach		= prism2_attach,
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
++	.event          = prism2_event,
++#endif
+ 	.detach		= prism2_detach,
+ 	.owner		= THIS_MODULE,
+ };
diff --git a/openembedded/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch
new file mode 100644
index 0000000000..c29cc8d2c9
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch
@@ -0,0 +1,77 @@
+diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap.c hostap-driver-0.3.7/driver/modules/hostap.c
+--- hostap-driver-0.3.7.orig/driver/modules/hostap.c	2005-07-25 09:14:01.995965088 +0000
++++ hostap-driver-0.3.7/driver/modules/hostap.c	2005-07-25 09:13:22.301999488 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/if_arp.h>
+ #include <linux/delay.h>
+ #include <linux/random.h>
++#include <linux/utsname.h>
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
+ #include <linux/tqueue.h>
+ #else
+diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c
+--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c	2005-07-25 09:14:01.996964936 +0000
++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c	2005-07-25 09:13:22.302999336 +0000
+@@ -19,6 +19,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_arp.h>
++#include <linux/utsname.h>
+ #include <asm/string.h>
+ 
+ #include "hostap_crypt.h"
+diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c
+--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c	2005-07-25 09:14:01.996964936 +0000
++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c	2005-07-25 09:13:22.302999336 +0000
+@@ -19,6 +19,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_arp.h>
++#include <linux/utsname.h>
+ #include <asm/string.h>
+ 
+ #include "hostap_crypt.h"
+diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c
+--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c	2005-07-25 09:14:01.996964936 +0000
++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c	2005-07-25 09:13:22.302999336 +0000
+@@ -15,6 +15,7 @@
+ #include <linux/init.h>
+ #include <linux/slab.h>
+ #include <linux/random.h>
++#include <linux/utsname.h>
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
+ #include <linux/tqueue.h>
+ #else
+diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c hostap-driver-0.3.7/driver/modules/hostap_cs.c
+--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c	2005-07-25 09:14:01.997964784 +0000
++++ hostap-driver-0.3.7/driver/modules/hostap_cs.c	2005-07-25 09:13:22.302999336 +0000
+@@ -12,6 +12,7 @@
+ #include <linux/timer.h>
+ #include <linux/skbuff.h>
+ #include <linux/netdevice.h>
++#include <linux/utsname.h>
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
+ #include <linux/tqueue.h>
+ #else
+diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c hostap-driver-0.3.7/driver/modules/hostap_pci.c
+--- hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c	2005-07-25 09:14:01.997964784 +0000
++++ hostap-driver-0.3.7/driver/modules/hostap_pci.c	2005-07-25 09:13:22.303999184 +0000
+@@ -11,6 +11,7 @@
+ #include <linux/if.h>
+ #include <linux/skbuff.h>
+ #include <linux/netdevice.h>
++#include <linux/utsname.h>
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
+ #include <linux/tqueue.h>
+ #else
+diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c hostap-driver-0.3.7/driver/modules/hostap_plx.c
+--- hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c	2005-07-25 09:14:01.997964784 +0000
++++ hostap-driver-0.3.7/driver/modules/hostap_plx.c	2005-07-25 09:13:22.303999184 +0000
+@@ -14,6 +14,7 @@
+ #include <linux/if.h>
+ #include <linux/skbuff.h>
+ #include <linux/netdevice.h>
++#include <linux/utsname.h>
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
+ #include <linux/tqueue.h>
+ #else
diff --git a/openembedded/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch
new file mode 100644
index 0000000000..05f716e22f
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch
@@ -0,0 +1,70 @@
+Index: hostap-driver-0.3.9/driver/modules/hostap_cs.c
+===================================================================
+--- hostap-driver-0.3.9.orig/driver/modules/hostap_cs.c	2005-08-24 10:11:47.000000000 +0100
++++ hostap-driver-0.3.9/driver/modules/hostap_cs.c	2005-08-24 10:39:10.000000000 +0100
+@@ -908,6 +908,57 @@
+ 	return 0;
+ }
+ 
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
++static struct pcmcia_device_id hostap_cs_ids[] = {
++	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
++	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
++	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
++	PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
++	PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
++	PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
++	PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
++	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
++	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),
++	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
++	PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
++	PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
++	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
++	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
++	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
++	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
++	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
++	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
++	PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
++				    0x7a954bd9, 0x74be00c6),
++	PCMCIA_DEVICE_PROD_ID1234(
++		"Intersil", "PRISM 2_5 PCMCIA ADAPTER",	"ISL37300P",
++		"Eval-RevA",
++		0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
++	PCMCIA_DEVICE_PROD_ID123(
++		"Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
++		0xe6ec52ce, 0x08649af2, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID123(
++		"D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
++		0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID123(
++		"Instant Wireless ", " Network PC CARD", "Version 01.02",
++		0x11d901af, 0x6e9bd926, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID123(
++		"SMC", "SMC2632W", "Version 01.02",
++		0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
++				0x54f7c49c, 0x15a75e5b),
++	PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
++				0x74c5e40d, 0xdb472a18),
++	PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
++				0x0733cc81, 0x0c52f395),
++	PCMCIA_DEVICE_PROD_ID12(
++		"ZoomAir 11Mbps High", "Rate wireless Networking",
++		0x273fe3db, 0x32a1eaee),
++	PCMCIA_DEVICE_NULL
++};
++MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
++#endif
+ 
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67)
+ static struct pcmcia_driver hostap_driver = {
+@@ -917,6 +968,7 @@
+ 	.attach		= prism2_attach,
+ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
+ 	.event          = prism2_event,
++	.id_table       = hostap_cs_ids,
+ #endif
+ 	.detach		= prism2_detach,
+ 	.owner		= THIS_MODULE,
diff --git a/openembedded/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch
index b139ef38f1..b139ef38f1 100644
--- a/openembedded/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch
diff --git a/openembedded/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff b/openembedded/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff
index c2d6662d69..c2d6662d69 100644
--- a/openembedded/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff
diff --git a/openembedded/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff b/openembedded/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff
index e979b72d93..e979b72d93 100644
--- a/openembedded/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff
diff --git a/openembedded/packages/hostap/hostap-modules_0.4.4.bb b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
index fd7a3eaff9..1be1e6a77e 100644
--- a/openembedded/packages/hostap/hostap-modules_0.4.4.bb
+++ b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
@@ -3,10 +3,14 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
+PR = "r4"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
-           file://hostap_cs.conf "
-
+           file://hostap_cs.conf \
+	   file://Makefile.patch;patch=1 \
+	   file://add_event.patch;patch=1 \
+	   file://hostap-utsname.patch;patch=1 \
+	   file://hostap_cardid.patch;patch=1"
 SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
 	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
 SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
diff --git a/openembedded/packages/initscripts/initscripts_1.0.bb b/openembedded/packages/initscripts/initscripts_1.0.bb
index 4c92d07130..2ad0197a75 100644
--- a/openembedded/packages/initscripts/initscripts_1.0.bb
+++ b/openembedded/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r57"
+PR = "r58"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -41,6 +41,8 @@ SRC_URI_append_tosa         = " file://keymap-*.map"
 SRC_URI_append_akita        = " file://keymap-*.map"
 SRC_URI_append_spitz        = " file://keymap-*.map"
 SRC_URI_append_borzoi       = " file://keymap-*.map"
+SRC_URI_append_collie       = " file://keymap-*.map"
+SRC_URI_append_poodle       = " file://keymap-*.map"
 
 def read_kernel_version(d):
 	import bb
@@ -103,7 +105,7 @@ do_install () {
 	fi
 
     case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | borzoi )
+        c7x0 | tosa | spitz | akita | borzoi | collie | poodle )
 			install -m 0755 ${WORKDIR}/keymap		${D}${sysconfdir}/init.d
 			ln -sf	../init.d/keymap	${D}${sysconfdir}/rcS.d/S00keymap
 			install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
diff --git a/openembedded/packages/irda-utils/irda-utils_0.9.16.bb b/openembedded/packages/irda-utils/irda-utils_0.9.16.bb
index d99846f8cd..2e09edd841 100644
--- a/openembedded/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/openembedded/packages/irda-utils/irda-utils_0.9.16.bb
@@ -10,6 +10,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
 	   file://m4.patch;patch=1 \
 	   file://init"
 
+export SYS_INCLUDES="-I${STAGING_INCDIR}"
+
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "irattach"
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch b/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch
deleted file mode 100644
index e97650a9de..0000000000
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null	2004-06-02 16:28:12.000000000 -0500
-+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh4/sigcontext.h	2004-08-27 17:56:59.000000000 -0500
-@@ -0,0 +1,24 @@
-+#ifndef __ASM_CPU_SH4_SIGCONTEXT_H
-+#define __ASM_CPU_SH4_SIGCONTEXT_H
-+
-+struct sigcontext {
-+	unsigned long	oldmask;
-+
-+	/* CPU registers */
-+	unsigned long sc_regs[16];
-+	unsigned long sc_pc;
-+	unsigned long sc_pr;
-+	unsigned long sc_sr;
-+	unsigned long sc_gbr;
-+	unsigned long sc_mach;
-+	unsigned long sc_macl;
-+
-+	/* FPU registers */
-+	unsigned long sc_fpregs[16];
-+	unsigned long sc_xfpregs[16];
-+	unsigned int sc_fpscr;
-+	unsigned int sc_fpul;
-+	unsigned int sc_ownedfp;
-+};
-+
-+#endif /* __ASM_CPU_SH4_SIGCONTEXT_H */
---- /dev/null	2004-06-02 16:28:12.000000000 -0500
-+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh2/sigcontext.h	2004-08-27 17:57:54.000000000 -0500
-@@ -0,0 +1,17 @@
-+#ifndef __ASM_CPU_SH2_SIGCONTEXT_H
-+#define __ASM_CPU_SH2_SIGCONTEXT_H
-+
-+struct sigcontext {
-+	unsigned long	oldmask;
-+
-+	/* CPU registers */
-+	unsigned long sc_regs[16];
-+	unsigned long sc_pc;
-+	unsigned long sc_pr;
-+	unsigned long sc_sr;
-+	unsigned long sc_gbr;
-+	unsigned long sc_mach;
-+	unsigned long sc_macl;
-+};
-+
-+#endif /* __ASM_CPU_SH2_SIGCONTEXT_H */
---- /dev/null	2004-06-02 16:28:12.000000000 -0500
-+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh3/sigcontext.h	2004-08-27 17:57:58.000000000 -0500
-@@ -0,0 +1,17 @@
-+#ifndef __ASM_CPU_SH3_SIGCONTEXT_H
-+#define __ASM_CPU_SH3_SIGCONTEXT_H
-+
-+struct sigcontext {
-+	unsigned long	oldmask;
-+
-+	/* CPU registers */
-+	unsigned long sc_regs[16];
-+	unsigned long sc_pc;
-+	unsigned long sc_pr;
-+	unsigned long sc_sr;
-+	unsigned long sc_gbr;
-+	unsigned long sc_mach;
-+	unsigned long sc_macl;
-+};
-+
-+#endif /* __ASM_CPU_SH3_SIGCONTEXT_H */
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff b/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff
deleted file mode 100644
index a06b5affd9..0000000000
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/asm-mips/atomic.h.orig	2004-10-01 10:10:05.487734944 +0200
-+++ include/asm-mips/atomic.h	2004-10-01 10:10:15.837161592 +0200
-@@ -15,8 +15,6 @@
- #define _ASM_ATOMIC_H
- 
- 
--#include <asm/system.h>
--
- typedef struct { volatile int counter; } atomic_t;
- typedef struct { volatile __s64 counter; } atomic64_t;
- 
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index c7d6367c7b..65e3f8b25b 100644
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -36,11 +36,11 @@ do_configure () {
 	if test !  -e include/asm-$ARCH; then
 		oefatal unable to create asm symlink in kernel headers
 	fi
-	cp -a "include/asm-$ARCH" "include/asm"
+	cp -pPR "include/asm-$ARCH" "include/asm"
 	if test "$ARCH" = "arm"; then
-		cp -a include/asm/arch-ebsa285 include/asm/arch
+		cp -pPR include/asm/arch-ebsa285 include/asm/arch
 	elif test "$ARCH" = "sh"; then
-		cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
+		cp -pPR include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
 	fi
 }
 
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
deleted file mode 100644
index f881d38a34..0000000000
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-SECTION = "devel"
-DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-INHIBIT_DEFAULT_DEPS = "1"
-PR = "r3"
-LICENSE = "GPL"
-# NOTE: no need to package these headers, since the c library includes them.
-PACKAGES = ""
-
-SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
-	   file://sh-missing.patch;patch=1 \
-	   file://keyboard.patch;patch=1"
-S = "${WORKDIR}/linux-libc-headers-${PV}"
-
-do_configure () {
-	case ${TARGET_ARCH} in
-		alpha*)   ARCH=alpha ;;
-		arm*)     ARCH=arm ;;
-		cris*)    ARCH=cris ;;
-		hppa*)    ARCH=parisc ;;
-		i*86*)    ARCH=i386 ;;
-		ia64*)    ARCH=ia64 ;;
-		mips*)    ARCH=mips ;;
-		m68k*)    ARCH=m68k ;;
-		powerpc*) ARCH=ppc ;;
-		s390*)    ARCH=s390 ;;
-		sh*)      ARCH=sh ;;
-		sparc64*) ARCH=sparc64 ;;
-		sparc*)   ARCH=sparc ;;
-		x86_64*)  ARCH=x86_64 ;;
-	esac
-	if test !  -e include/asm-$ARCH; then
-		oefatal unable to create asm symlink in kernel headers
-	fi
-	cp -a "include/asm-$ARCH" "include/asm"
-	if test "$ARCH" = "arm"; then
-		cp -a include/asm/arch-ebsa285 include/asm/arch
-	elif test "$ARCH" = "sh"; then
-		cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
-	fi
-}
-
-do_stage () {
-	install -d ${STAGING_INCDIR}
-	rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
-	cp -pfLR include/linux ${STAGING_INCDIR}/
-	cp -pfLR include/asm ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
-
-	ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${STAGING_INCDIR}/linux/wireless.h
-	ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${CROSS_DIR}/${TARGET_SYS}/include/linux/wireless.h
-}
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
deleted file mode 100644
index c127e8a9e7..0000000000
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-SECTION = "devel"
-DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
-HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
-# license note from the package: 
-#   Linux-libc-headers are derived from linux kernel headers. For license of a
-#   particular header, check it's content, and if copyright notice isn't present,
-#   standard linux kernel license applies. 
-# since we assume GPL for linux i think we can also assume it here
-LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-INHIBIT_DEFAULT_DEPS = "1"
-PR = "r7"
-
-# NOTE: no need to package these headers, since the c library includes them.
-PACKAGES = ""
-
-SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
-	file://mips-asm-atomic-system.diff;patch=1;pnum=0 \
-	file://keyboard.patch;patch=1"
-	
-S = "${WORKDIR}/linux-libc-headers-${PV}"
-
-do_configure () {
-	case ${TARGET_ARCH} in
-		alpha*)   ARCH=alpha ;;
-		arm*)     ARCH=arm ;;
-		cris*)    ARCH=cris ;;
-		hppa*)    ARCH=parisc ;;
-		i*86*)    ARCH=i386 ;;
-		ia64*)    ARCH=ia64 ;;
-		mips*)    ARCH=mips ;;
-		m68k*)    ARCH=m68k ;;
-		powerpc*) ARCH=ppc ;;
-		s390*)    ARCH=s390 ;;
-		sh*)      ARCH=sh ;;
-		sparc64*) ARCH=sparc64 ;;
-		sparc*)   ARCH=sparc ;;
-		x86_64*)  ARCH=x86_64 ;;
-	esac
-	if test !  -e include/asm-$ARCH; then
-		oefatal unable to create asm symlink in kernel headers
-	fi
-	cp -a "include/asm-$ARCH" "include/asm"
-	if test "$ARCH" = "arm"; then
-		cp -a include/asm/arch-ebsa285 include/asm/arch
-	elif test "$ARCH" = "sh"; then
-		cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
-	fi
-}
-
-do_stage () {
-	install -d ${STAGING_INCDIR}
-	rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
-	cp -pfLR include/linux ${STAGING_INCDIR}/
-	cp -pfLR include/asm ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/as