summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Randolf <br1@subnet.at>2004-10-18 16:48:13 +0000
committerBruno Randolf <br1@subnet.at>2004-10-18 16:48:13 +0000
commitbe5dd74404258c494d3dceb9e6df24e34e077d84 (patch)
tree7cd81cf861cdbba80ab7eee5698d60235554297b
parent9e24f051016944f069ff0550319ba533e4eda889 (diff)
wlan-ng: patch by Murray Jensen to differentiate between KERNEL_CC and CC
BKrev: 4173f3cdiOFKkacu1aIwzQFeuQ7jLA
-rw-r--r--wlan-ng/files/pass-kernel-cross.patch0
-rw-r--r--wlan-ng/wlan-ng-modules_0.2.1pre22.oe17
2 files changed, 16 insertions, 1 deletions
diff --git a/wlan-ng/files/pass-kernel-cross.patch b/wlan-ng/files/pass-kernel-cross.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/wlan-ng/files/pass-kernel-cross.patch
diff --git a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
index cc1c6006b8..b5b8a10e85 100644
--- a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
+++ b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
@@ -1,14 +1,16 @@
SECTION = "base"
DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards"
DEPENDS = "virtual/kernel"
+RRECOMMENDS = "wlan-ng-utils"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://no-compat.patch;patch=1 \
file://Ambit_usb.patch;patch=1 \
file://scripts-makefile-hostcc.diff;patch=1;pnum=0 \
+ file://pass-kernel-cross.patch;patch=1;pnum=0 \
file://wlan-ng.modutils \
file://wlan.agent \
file://config.in \
@@ -34,6 +36,19 @@ do_configure() {
oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
}
+# override module_do_install in module.oeclass - dont want to set CC and
+# LD unless actually compiling the kernel modules - there are other user
+# level programs to be compiled. Note we need to use same compiler
+# that was used to build the kernel
+do_compile() {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
+ KERNEL_SRC=${STAGING_KERNEL_DIR} \
+ KERNEL_VERSION=${KERNEL_VERSION} \
+ KERNEL_CC="${KERNEL_CC}" KERNEL_LD="${KERNEL_LD}" \
+ ${MAKE_TARGETS}
+}
+
do_install() {
oe_runmake install DESTDIR=${D} TARGET_MODDIR=
mkdir -p ${D}/etc/modutils/