switch to linux-libc-headers - patch courtesy pb_.

BKrev: 40995225xjmf1MDuSgma5UgSjXJpqQ

1 files changed, 15 insertions, 22 deletions

diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe
index 8b1f0d8294..04000db628 100644
--- a/glibc/glibc_cvs.oe
+++ b/glibc/glibc_cvs.oe
@@ -1,5 +1,6 @@
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs"
 PV = "2.3.2+cvs${CVSDATE}"
+PR = "r1"
 DESCRIPTION = "GNU C Library"
 LICENSE = "LGPL"
 SECTION = "libs"
@@ -36,11 +37,14 @@ FILES_glibc-dev_append = " ${libdir}/*.o"
 FILES_glibc-gconv = "${libdir}/gconv"
 FILES_glibc-i18n = "${datadir}/i18n"
 
+HEADERS_VERSION = "2.6.5.1"
+HEADERS_DIR = "${WORKDIR}/linux-libc-headers-${HEADERS_VERSION}"
+
 #	   file://${FILESDIR}/noinfo.patch;patch=1 \
 #	   file://${FILESDIR}/ldconfig.patch;patch=1;pnum=0 \
 
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \
-	   http://handhelds.org/~pb/kernel-headers-2.6.5.tar.bz2 \
+	   http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${HEADERS_VERSION}.tar.bz2 \
 	   file://${FILESDIR}/arm-ioperm.patch;patch=1;pnum=0 \
 	   file://${FILESDIR}/makeconfig.patch;patch=1;pnum=0 \
 	   file://${FILESDIR}/ldd.patch;patch=1;pnum=0 \
@@ -58,13 +62,10 @@ inherit autotools
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 	        --without-cvs --disable-profile --disable-debug --without-gd \
 		--enable-clocale=gnu \
-	        --enable-add-ons=${GLIBC_ADDONS} --with-headers=${WORKDIR}/linux/include ${GLIBC_EXTRA_OECONF}"
+	        --enable-add-ons=${GLIBC_ADDONS} --with-headers=${HEADERS_DIR}/include ${GLIBC_EXTRA_OECONF}"
 
 glibcbuild_do_unpack () {
 # kernel headers
-	touch ${WORKDIR}/linux/include/linux/autoconf.h
-	sed 's:\(^.*define.*__NR_waitpid.*$\):/*&*/:' < ${WORKDIR}/linux/include/asm-arm/unistd.h > ${WORKDIR}/linux/include/asm-arm/unistd.h.new
-	mv ${WORKDIR}/linux/include/asm-arm/unistd.h.new ${WORKDIR}/linux/include/asm-arm/unistd.h
 	case ${TARGET_ARCH} in
 		alpha*)   TARGET_ARCH=alpha ;;
 		arm*)     TARGET_ARCH=arm ;;
@@ -81,13 +82,13 @@ glibcbuild_do_unpack () {
 		sparc*)   TARGET_ARCH=sparc ;;
 		x86_64*)  TARGET_ARCH=x86_64 ;;
 	esac
-	if test !  -e ${WORKDIR}/linux/include/asm-$TARGET_ARCH; then
+	if test !  -e ${HEADERS_DIR}/include/asm-$TARGET_ARCH; then
 		oefatal unable to create asm symlink in kernel headers
 	fi
-	ln -sf "asm-$TARGET_ARCH" "${WORKDIR}/linux/include/asm"
+	ln -sf "asm-$TARGET_ARCH" "${HEADERS_DIR}/include/asm"
 	if test "$TARGET_ARCH" = "arm"; then
-		ln -sf proc-armv ${WORKDIR}/linux/include/asm/proc
-		ln -sf arch-ebsa285 ${WORKDIR}/linux/include/asm/arch
+		ln -sf proc-armv ${HEADERS_DIR}/include/asm/proc
+		ln -sf arch-ebsa285 ${HEADERS_DIR}/include/asm/arch
 	fi
 }
 
@@ -131,10 +132,8 @@ do_stage() {
 		   install-headers install-lib
 
 	install -d ${STAGING_INCDIR}/asm
-	cp -a ${WORKDIR}/linux/include/linux ${STAGING_INCDIR}/
-	cp -a ${WORKDIR}/linux/include/asm/* ${STAGING_INCDIR}/asm/
-	install -d ${STAGING_INCDIR}/asm-generic
-	cp -a ${WORKDIR}/linux/include/asm-generic/* ${STAGING_INCDIR}/asm-generic/
+	cp -a ${HEADERS_DIR}/include/linux ${STAGING_INCDIR}/
+	cp -a ${HEADERS_DIR}/include/asm/* ${STAGING_INCDIR}/asm/
 
 	install -d ${STAGING_INCDIR}/gnu \
 		   ${STAGING_INCDIR}/bits \
@@ -159,10 +158,8 @@ do_stage() {
 		   install-headers install-lib
 
 	install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	cp -a ${WORKDIR}/linux/include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -R ${WORKDIR}/linux/include/asm/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
-	cp -R ${WORKDIR}/linux/include/asm-generic/* ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic/
+	cp -a ${HEADERS_DIR}/include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
+	cp -R ${HEADERS_DIR}/include/asm/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
 
 	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
 		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
@@ -211,11 +208,7 @@ python package_do_split_gconvs () {
 # We want to do this indirection so that we can safely 'return'
 # from the called function even though we're prepending
 python populate_packages_prepend () {
-	oe.build.exec_func('package_do_split_gconvs', d)
-}
-
-python do_package () {
 	if oe.data.getVar('DEBIAN_NAMES', d, 1):
 		oe.data.setVar('PKG_glibc', 'libc6', d)
-	oe.build.exec_func('package_do_package', d)
+	oe.build.exec_func('package_do_split_gconvs', d)
 }