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, 10 insertions, 2 deletions

diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
index 8c6222560f..7cb5c4aa2d 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -36,7 +36,7 @@ do_install() {
         set_arch
         install -d ${D}${includedir}
         cp -pfLR ${S}${includedir}/linux ${D}${includedir}/
-        cp -pfLR ${S}${includedir}/asm-$ARCH ${D}${includedir}/asm
+        cp -pfLR ${S}${includedir}/asm-${ARCH} ${D}${includedir}/asm
         cp -pfLR ${S}${includedir}/asm-generic ${D}${includedir}/
 }
 
@@ -45,6 +45,14 @@ do_stage () {
         install -d ${STAGING_INCDIR}
         rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic
         cp -pfLR ${S}${includedir}/linux ${STAGING_INCDIR}/
-        cp -pfLR ${S}${includedir}/asm-$ARCH ${STAGING_INCDIR}/asm
+        cp -pfLR ${S}${includedir}/asm-${ARCH} ${STAGING_INCDIR}/asm
         cp -pfLR ${S}${includedir}/asm-generic ${STAGING_INCDIR}/
 }
+
+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/
+}
+