Toolchain updates:

	* Consolodate libc kernel header bits into one place, making uclibc
	  build against the 2.6 ones while we're at it.
	* Kill off the -initial glibc and uclibc, since first pass gcc can be
	  built without it (thanks gb).

BKrev: 4110927a6L5iwvPl5iNtHBpvnsxmOA

1 files changed, 23 insertions, 48 deletions

diff --git a/uclibc-snapshot/uclibc-snapshot_cvs.oe b/uclibc-snapshot/uclibc-snapshot_cvs.oe
index bdcafb35df..20081eb0b4 100644
--- a/uclibc-snapshot/uclibc-snapshot_cvs.oe
+++ b/uclibc-snapshot/uclibc-snapshot_cvs.oe
@@ -4,6 +4,7 @@ SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 PV = "${CVSDATE}"
+PR = "r1"
 
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
@@ -21,23 +22,9 @@ python __anonymous () {
                                    oe.data.getVar('TARGET_OS', d, 1))
 }
 
-#
-# We can only work currently with a predefined .config, this ensures we have
-# one.  In the future, this may want to respect ${MACHINE} as well.
-#
-
-python __anonymous () {
-    import oe, os;
-    conf = (oe.data.getVar('FILESDIR', d, 1) + "/uClibc.config." +
-            oe.data.getVar('TARGET_ARCH', d, 1))
-    if not os.access(conf, os.R_OK):
-        raise oe.parse.SkipPackage("no available .config for target %s" %
-                                   oe.data.getVar('TARGET_OS', d, 1))
-}
-
 PROVIDES += " virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 DEPENDS = "patcher-native virtual/${TARGET_PREFIX}binutils \
-	   virtual/${TARGET_PREFIX}gcc-initial"
+	   virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
 #
@@ -48,56 +35,44 @@ INHIBIT_DEFAULT_DEPS = "1"
 UCLIBC_LOCALE_FILE = "uClibc-locale-030818.tgz"
 SRC_URI = "cvs://anonymous:@166.70.99.138/var/cvs;module=uClibc \
            http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE} \
-           http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2 \
-           file://uClibc.config.${TARGET_ARCH}"
+           file://nokernelheadercheck.patch;patch=1 \
+           file://uClibc.config"
 
 S = "${WORKDIR}/uClibc"
 
 UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
 UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
 
-EXTRA_OEMAKE = ""
-
-uclibcbuild_do_patch() {
-	rm -f ${WORKDIR}/linux/include/asm
-	ln -sf asm-${TARGET_ARCH} ${WORKDIR}/linux/include/asm
-
-	touch ${WORKDIR}/linux/include/linux/autoconf.h
-
-	echo "#define UTS_RELEASE \"2.4.21\"" > ${WORKDIR}/linux/include/linux/version.h
-	echo "#define LINUX_VERSION_CODE 132117" >> ${WORKDIR}/linux/include/linux/version.h
-	echo "#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))" \
-		>> ${WORKDIR}/linux/include/linux/version.h
+EXTRA_OEMAKE = "'OPTIMIZATION=' 'CPU_CFLAGS=${CFLAGS}' 'STRIPTOOL=true'"
+configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${CROSS_DIR}/${TARGET_SYS}/include",g; \
+		s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \
+		s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \
+		s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
+		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g;'
 
-	if [ -f ${WORKDIR}/uClibc.config.${TARGET_ARCH} ]; then
-		cp ${WORKDIR}/uClibc.config.${TARGET_ARCH} ${S}/.config
-	else
-		echo ERROR: No target specific config for ${TARGET_ARCH}
-		return 1
-	fi
-
-	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
-	perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"${WORKDIR}/linux\",g' ${S}/.config
-	perl -i -p -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' ${S}/.config
-	perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/${prefix}\",g' ${S}/.config
-	perl -i -p -e 's,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH=\"/lib\",g' ${S}/.config
-	perl -i -p -e 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' ${S}/.config
-
-	cp ${DL_DIR}/${UCLIBC_LOCALE_FILE} extra/locale
+python () {
+	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		oe.data.setVar('configmangle_append', ' s,^HAS_FPU=y,# HAS_FPU is not set,;', d)
 }
 
-uclibcbuild_do_fpumangle() {
-	perl -i -p -e 's,^HAS_FPU=y,# HAS_FPU is not set,' ${S}/.config
+uclibcbuild_do_patch() {
+	ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux
+	ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm
+	
+	cp ${DL_DIR}/${UCLIBC_LOCALE_FILE} extra/locale
 }
 
 python do_patch () {
 	oe.build.exec_func('base_do_patch', d)
 	oe.build.exec_func('uclibcbuild_do_patch', d)
-	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		oe.build.exec_func('uclibcbuild_do_fpumangle', d)
 }
 
 do_configure() {
+	cp ${WORKDIR}/uClibc.config ${S}/.config
+
+	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
+	perl -i -p -e '${configmangle}' ${S}/.config
+
 	oe_runmake oldconfig
 }