3 files changed, 6 insertions, 12 deletions

diff --git a/meta/packages/linux-libc-headers/linux-libc-headers.inc b/meta/packages/linux-libc-headers/linux-libc-headers.inc
index d9f4d687ee..43f0958863 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/packages/linux-libc-headers/linux-libc-headers.inc
@@ -1,3 +1,5 @@
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 SECTION = "devel"
 LICENSE = "GPL"
+
+DEPENDS = "cross-linkage"
\ No newline at end of file
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 1adaf26fc4..33cbb4ad28 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
@@ -1,8 +1,8 @@
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "unifdef-native"
-PR = "r4"
+DEPENDS += "unifdef-native"
+PR = "r5"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://arm-syscall-define.patch;patch=1"
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index 6f169f89fc..3f5607684a 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -1,8 +1,8 @@
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "unifdef-native"
-PR = "r6"
+DEPENDS += "unifdef-native"
+PR = "r7"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
@@ -61,12 +61,4 @@ 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}/
-
-        rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux          
-        rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-        rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
-        install -d ${CROSS_DIR}/${TARGET_SYS}/include
-        ln -s ${STAGING_INCDIR}/linux ${CROSS_DIR}/${TARGET_SYS}/include/linux
-        ln -s ${STAGING_INCDIR}/asm ${CROSS_DIR}/${TARGET_SYS}/include/asm
-        ln -s ${STAGING_INCDIR}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
 }