From: Phil Blundell <philb@gnu.org>
Date: Sat, 6 Nov 2004 21:35:09 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel
X-Git-Tag: Release-2010-05/1~16380
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ef6062806b70d84affe969650d91439672797f5;p=openembedded.git

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 37e4d66063..415f5feb66 100644
--- 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
 }