diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-08-05 10:18:40 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-08-05 10:18:40 +0000 |
| commit | 63479cadd8521e43880b8d32288e1b4854f378f5 (patch) | |
| tree | 0ff84371604688a2335f518bdc6be390f6863aae | |
| parent | e995ca496c2c6989865664bf537144be164a570a (diff) | |
Merge
2004/08/05 12:17:33+02:00 uni-frankfurt.de!mickey
use the wireless.h from the kernel instead of always the most recent one from glibc
BKrev: 41120980xkPBj21Kss2h6OS6jchywg
| -rw-r--r-- | linux-libc-headers/linux-libc-headers_2.6.7.0.oe | 7 | ||||
| -rw-r--r-- | wireless-tools/wireless-tools_26.oe | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/linux-libc-headers/linux-libc-headers_2.6.7.0.oe b/linux-libc-headers/linux-libc-headers_2.6.7.0.oe index d6d88bfaa2..15826a5181 100644 --- a/linux-libc-headers/linux-libc-headers_2.6.7.0.oe +++ b/linux-libc-headers/linux-libc-headers_2.6.7.0.oe @@ -1,7 +1,7 @@ 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 = "r1" +PR = "r2" # NOTE: no need to package these headers, since the c library includes them. PACKAGES = "" @@ -40,9 +40,12 @@ do_stage () { rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm cp -pfLR include/linux ${STAGING_INCDIR}/ cp -pfLR include/asm ${STAGING_INCDIR}/ - install -d ${CROSS_DIR}/${TARGET_SYS}/include + ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${STAGING_INCDIR}/linux/wireless.h rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm + install -d ${CROSS_DIR}/${TARGET_SYS}/include 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 ${CROSS_DIR}/${TARGET_SYS}/include/linux/wireless.h + } diff --git a/wireless-tools/wireless-tools_26.oe b/wireless-tools/wireless-tools_26.oe index 86867f044a..73e5a14a19 100644 --- a/wireless-tools/wireless-tools_26.oe +++ b/wireless-tools/wireless-tools_26.oe @@ -7,8 +7,8 @@ LICENSE = "GPL" PR = "r4" SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \ -file://man.patch;patch=1 \ -file://wireless-tools.if-pre-up" + file://man.patch;patch=1 \ + file://wireless-tools.if-pre-up" S = "${WORKDIR}/wireless_tools.${PV}" export KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')} @@ -18,6 +18,11 @@ KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ld KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}" KERNEL_LD = "${LD}${KERNEL_LDSUFFIX}" +do_configure() { + rm -rf wireless.h + ln -s ${STAGING_KERNEL_DIR}/include/linux/wireless.h wireless.h +} + do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake KERNEL_SRC=${KERNEL_PATH} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y |