Apply wireless-tools if-pre-up.d patch to make it not try to work against wlan-ng...

BKrev: 41979ce9ihlRWDGRzcpaivq-yS1DSg

diff --git a/wireless-tools/wireless-tools/wireless-tools.if-pre-up b/wireless-tools/wireless-tools/wireless-tools.if-pre-up
index 54ee709..159402c 100644 (file)
--- a/wireless-tools/wireless-tools/wireless-tools.if-pre-up
+++ b/wireless-tools/wireless-tools/wireless-tools.if-pre-up
@@ -7,6 +7,14 @@ if [ ! -x $IWCONFIG ]; then
   exit 0
 fi
 
+# Detect and do nothing for linux-wlan-ng interfaces;
+# which are configured by thier own if-pre-up script.
+if [ -x /sbin/wlancfg ]; then
+  if /sbin/wlancfg show $IFACE >/dev/null 2>&1; then
+    exit 0
+  fi
+fi
+
 if [ -n "$IF_NEEDS_RESET" ]; then
   $IWPRIV "$IFACE" reset 1
   sleep 1

diff --git a/wireless-tools/wireless-tools_26.oe b/wireless-tools/wireless-tools_26.oe
index 2390bd8..ee54a69 100644 (file)
--- a/wireless-tools/wireless-tools_26.oe
+++ b/wireless-tools/wireless-tools_26.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/kernel"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
           file://man.patch;patch=1 \