Updates against mainline OE

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

5 files changed, 3 insertions, 203 deletions

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/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/
-}