linux-libc-headers: sync with OE (mainly safer use of and blackfin support)

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

1 files changed, 18 insertions, 4 deletions

diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index 33cbb4ad28..3abf26f4ff 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -30,7 +30,7 @@ set_arch() {
 
 do_configure() {
         set_arch
-        oe_runmake allnoconfig ARCH=$ARCH
+        oe_runmake allnoconfig ARCH=${ARCH}
 }
 
 do_compile () {
@@ -38,7 +38,7 @@ do_compile () {
 
 do_install() {
         set_arch
-        oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+        oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH}
 }
 
 do_install_append_arm() {
@@ -51,8 +51,8 @@ do_stage () {
         set_arch
         rm -rf ${STAGE_TEMP}
         mkdir -p ${STAGE_TEMP}
-        oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
-        if [ "$ARCH" = "arm" ]; then
+        oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
+        if [ "${ARCH}" == "arm" ]; then
                 cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
         fi
         install -d ${STAGING_INCDIR}
@@ -60,4 +60,18 @@ do_stage () {
         cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/
         cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/
         cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/
+        # Add UTS_RELEASE to version.h. UTS_RELEASE was moved from version.h to 
+        # utsrelease.h in order to avoid recompiling a kernel every time a localversion
+        # changed. Since the our headers are static and we're not compiling an 
+        # actual kernel, re-adding UTS_RELEASE does't hurt, and it allows uclibc to 
+        # compile with kernel headers that work with EABI on ARM
+        echo '#define UTS_RELEASE "2.6.18"' >> ${STAGING_INCDIR}/linux/version.h
 }
+
+do_stage_append_nylon () {
+        cp -pPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/
+        cp -pPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
+        cp -pPR include/linux/* ${STAGING_INCDIR}/linux/
+        cp -pPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/
+}
+