Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/06 20:56:11+00:00 nexus.co.uk!pb
only pull in the kernel's wireless.h if using 2.4

BKrev: 418d438d7y7sYg0waJKvfS_LSjLNbA

diff --git a/linux-libc-headers/linux-libc-headers_2.6.8.1.oe b/linux-libc-headers/linux-libc-headers_2.6.8.1.oe
index 37e4d66..415f5fe 100644 (file)
--- a/linux-libc-headers/linux-libc-headers_2.6.8.1.oe
+++ b/linux-libc-headers/linux-libc-headers_2.6.8.1.oe
@@ -2,7 +2,7 @@ SECTION = "devel"
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r3"
+PR = "r4"
 
 # NOTE: no need to package these headers, since the c library includes them.
 PACKAGES = ""
@@ -51,6 +51,9 @@ do_stage () {
        cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
        cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
 
-       ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${STAGING_INCDIR}/linux/wireless.h
-       ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${CROSS_DIR}/${TARGET_SYS}/include/linux/wireless.h
+       case `cat ${STAGING_KERNEL_DIR}/kernel-abiversion` in
+       2.4.*)
+               ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${STAGING_INCDIR}/linux/wireless.h
+               ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${CROSS_DIR}/${TARGET_SYS}/include/linux/wireless.h
+       esac
 }