wlan-ng: close #846 and #847

wlan-ng-utils: use HOST_LDFLAGS instead of LDFLAGS
wlan-ng-modules_0.2.3: fix usb-owner.patch
: ----------------------------------------------------------------------

diff --git a/packages/wlan-ng/wlan-ng-modules/usb-owner.patch b/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
index 06a3055..be6c2a9 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
+++ b/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
@@ -1,13 +1,13 @@
-Index: trunk/src/prism2/driver/prism2_usb.c
+Index: linux-wlan-ng-0.2.3/src/prism2/driver/prism2_usb.c
 ===================================================================
---- trunk.orig/src/prism2/driver/prism2_usb.c  2006-04-02 11:06:32.045530320 +0200
-+++ trunk/src/prism2/driver/prism2_usb.c       2006-04-02 11:09:31.080312896 +0200
+--- linux-wlan-ng-0.2.3.orig/src/prism2/driver/prism2_usb.c    2006-04-18 20:09:17.403457000 +0200
++++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2_usb.c 2006-04-18 20:11:21.064657640 +0200
 @@ -313,7 +313,7 @@
  
  
  struct usb_driver prism2_usb_driver = {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)) 
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))) 
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)))
        .owner = THIS_MODULE,
  #endif
        .name = "prism2_usb",

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
index b702dc7..accf682 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
@@ -1,7 +1,8 @@
 include wlan-ng-modules.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-           file://prism2sta_commsqual_defer.patch;patch=1"
+           file://prism2sta_commsqual_defer.patch;patch=1 \
+           file://usb-owner.patch;patch=1 "
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
 

diff --git a/packages/wlan-ng/wlan-ng-utils/hostldflags.patch b/packages/wlan-ng/wlan-ng-utils/hostldflags.patch
new file mode 100644 (file)
index 0000000..93893a5
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils/hostldflags.patch
@@ -0,0 +1,20 @@
+Index: linux-wlan-ng-0.2.3/src/mkmeta/Makefile
+===================================================================
+--- linux-wlan-ng-0.2.3.orig/src/mkmeta/Makefile       2005-01-26 23:01:07.000000000 +0100
++++ linux-wlan-ng-0.2.3/src/mkmeta/Makefile    2006-04-18 22:07:58.937819216 +0200
+@@ -90,13 +90,13 @@
+ 
+ 
+ mkmetadef:    $(MKMETADEF_OBJ) mkmetadefhead.txt
+-      $(HOST_CC) $(LDFLAGS) -o $@ $(MKMETADEF_OBJ)
++      $(HOST_CC) $(HOST_LDFLAGS) -o $@ $(MKMETADEF_OBJ)
+       cat mkmetadefhead.txt > ../include/wlan/p80211metadef.h
+       ./mkmetadef >> ../include/wlan/p80211metadef.h
+       echo "#endif" >> ../include/wlan/p80211metadef.h
+ 
+ mkmetastruct: $(MKMETASTRUCT_OBJ) mkmetastructhead.txt
+-      $(HOST_CC) $(LDFLAGS) -o $@ $(MKMETASTRUCT_OBJ)
++      $(HOST_CC) $(HOST_LDFLAGS) -o $@ $(MKMETASTRUCT_OBJ)
+       cat mkmetastructhead.txt > ../include/wlan/p80211metastruct.h
+       ./mkmetastruct >> ../include/wlan/p80211metastruct.h
+       echo "#endif" >> ../include/wlan/p80211metastruct.h

diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
index 17cf3ca..88174a9 100644 (file)
--- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
@@ -3,12 +3,13 @@ HOMEPAGE = "http://www.linux-wlan.org"
 SECTION = "kernel/userland"
 DEPENDS = "virtual/kernel"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
        file://only-the-utils.patch;patch=1 \
        file://scripts-makefile-hostcc.patch;patch=1 \
        file://pcmciasrc.patch;patch=1 \
+       file://hostldflags.patch;patch=1 \
        file://wlan-ng.modutils \
        file://wlan.agent \
        file://usbctl \

diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index a5762e3..ca10cc1 100644 (file)
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -3,13 +3,14 @@ HOMEPAGE = "http://www.linux-wlan.org"
 SECTION = "kernel/userland"
 DEPENDS = "virtual/kernel"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 PV = "0.2.3+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
        file://only-the-utils.patch;patch=1 \
        file://scripts-makefile-hostcc.patch;patch=1 \
        file://pcmciasrc.patch;patch=1 \
+       file://hostldflags.patch;patch=1 \
        file://wlan-ng.modutils \
        file://wlan.agent \
        file://usbctl \