summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/wireless-tools/wireless-tools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/wireless-tools/wireless-tools')
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch21
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch22
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch15
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch19
-rwxr-xr-xmeta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up122
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up34
6 files changed, 233 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
new file mode 100644
index 0000000..f34e243
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
@@ -0,0 +1,21 @@
1wireless_tools: Avoid stripping iwmulticall
2
3Upstream-Status: Inappropriate [other]
4 The removed code was from upstream.
5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7
8diff -ur wireless_tools.29.orig/Makefile wireless_tools.29/Makefile
9--- wireless_tools.29.orig/Makefile 2011-06-18 11:35:12.183907453 -0500
10+++ wireless_tools.29/Makefile 2011-06-18 11:38:09.995907985 -0500
11@@ -135,9 +135,8 @@
12
13 macaddr: macaddr.o $(IWLIB)
14
15-# Always do symbol stripping here
16 iwmulticall: iwmulticall.o
17- $(CC) $(LDFLAGS) -Wl,-s $(XCFLAGS) -o $@ $^ $(LIBS)
18+ $(CC) $(LDFLAGS) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS)
19
20 # It's a kind of magic...
21 wireless.h:
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
new file mode 100644
index 0000000..6c0d8cb
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
@@ -0,0 +1,22 @@
1wireless-tools: Remove QA warning: No GNU_HASH in the elf binary
2
3Upstream-Status: Inappropriate [other]
4 Useful within bitbake environment only.
5
6Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
7
8---
9 Makefile | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12--- wireless_tools.29.orig/Makefile
13+++ wireless_tools.29/Makefile
14@@ -144,7 +144,7 @@ wireless.h:
15
16 # Compilation of the dynamic library
17 $(DYNAMIC): $(OBJS:.o=.so)
18- $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^
19+ $(CC) -shared -o $@ -Wl,-soname,$@ $(LDFLAGS) $(STRIPFLAGS) $(LIBS) -lc $^
20
21 # Compilation of the static library
22 $(STATIC): $(OBJS:.o=.so)
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
new file mode 100644
index 0000000..6a757da
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: wireless_tools.30/Makefile
4===================================================================
5--- wireless_tools.30.orig/Makefile 2014-02-01 00:21:04.148463382 -0800
6+++ wireless_tools.30/Makefile 2014-02-01 00:23:35.448072279 -0800
7@@ -76,7 +76,7 @@
8 INSTALL_DIR= $(PREFIX)/sbin
9 INSTALL_LIB= $(PREFIX)/lib
10 INSTALL_INC= $(PREFIX)/include
11-INSTALL_MAN= $(PREFIX)/man
12+INSTALL_MAN= $(PREFIX)/share/man
13
14 # Various commands
15 RM = rm -f
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
new file mode 100644
index 0000000..3a22c3f
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
@@ -0,0 +1,19 @@
1When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
2(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
3touch */libstdc++.so && /sbin/ldconfig to fix it.
4
5So remove ldconfig call from make install-libs
6
7Upstream-Status: Inappropriate [disable feature]
8
9diff -uNr wireless_tools.29.orig/Makefile wireless_tools.29/Makefile
10--- wireless_tools.29.orig/Makefile 2007-09-18 01:56:46.000000000 +0200
11+++ wireless_tools.29/Makefile 2012-02-15 20:46:41.780763514 +0100
12@@ -163,7 +163,6 @@
13 install -m 755 $(DYNAMIC) $(INSTALL_LIB)
14 ln -sfn $(DYNAMIC) $(INSTALL_LIB)/$(DYNAMIC_LINK)
15 @echo "*** Don't forget to add $(INSTALL_LIB) to /etc/ld.so.conf, and run ldconfig as root. ***"
16- @$(LDCONFIG) || echo "*** Could not run ldconfig ! ***"
17
18 # Install the static library
19 install-static:: $(STATIC)
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up b/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up
new file mode 100755
index 0000000..2518a5c
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up
@@ -0,0 +1,122 @@
1#!/bin/sh
2
3case "$METHOD" in loopback) exit 0 ;; esac
4
5IWCONFIG=/sbin/iwconfig
6IWPRIV=/sbin/iwpriv
7
8if [ ! -x $IWCONFIG ]; then
9 exit 0
10fi
11
12# Detect and do nothing for linux-wlan-ng interfaces;
13# which are configured by thier own if-pre-up script.
14if [ -n "$IF_WIRELESS_TYPE" -a "$IF_WIRELESS_TYPE" = "wlan-ng" ]; then
15 exit 0
16fi
17
18if [ -n "$IF_NEEDS_RESET" ]; then
19 $IWPRIV "$IFACE" reset 1
20 sleep 1
21fi
22
23if [ -n "$IF_NEEDS_FIRMWARE" ]; then
24 $IF_NEEDS_FIRMWARE "$IFACE"
25fi
26
27if [ -n "$IF_WIRELESS_SENS" ]; then
28 $IWCONFIG "$IFACE" sens $IF_WIRELESS_SENS
29fi
30
31if [ -n "$IF_WIRELESS_RATE" ]; then
32 $IWCONFIG "$IFACE" rate $IF_WIRELESS_RATE
33fi
34
35if [ -n "$IF_WIRELESS_RTS" ]; then
36 $IWCONFIG "$IFACE" rts $IF_WIRELESS_RTS
37fi
38
39if [ -n "$IF_WIRELESS_FRAG" ]; then
40 $IWCONFIG "$IFACE" frag $IF_WIRELESS_FRAG
41fi
42
43if [ -n "$IF_WIRELESS_POWER" ]; then
44 $IWCONFIG "$IFACE" power $IF_WIRELESS_POWER
45fi
46
47if [ -n "$IF_WIRELESS_POWERPERIOD" ]; then
48 $IWCONFIG "$IFACE" power period $IF_WIRELESS_POWERPERIOD
49fi
50
51if [ -n "$IF_WIRELESS_POWERTIMEOUT" ]; then
52 $IWCONFIG "$IFACE" power timeout $IF_WIRELESS_POWERTIMEOUT
53fi
54
55if [ -n "$IF_WIRELESS_TXPOWER" ]; then
56 $IWCONFIG "$IFACE" txpower $IF_WIRELESS_TXPOWER
57fi
58
59if [ -n "$IF_WIRELESS_RETRY" ]; then
60 $IWCONFIG "$IFACE" retry $IF_WIRELESS_RETRY
61fi
62
63if [ -n "$IF_WIRELESS_NICK" ]; then
64 $IWCONFIG "$IFACE" nick "$IF_WIRELESS_NICK"
65fi
66
67if [ -n "$IF_WIRELESS_NWID" ]; then
68 $IWCONFIG "$IFACE" nwid "$IF_WIRELESS_NWID"
69fi
70
71if [ -n "$IF_WIRELESS_ENC" ]; then
72 eval $IWCONFIG "$IFACE" enc $IF_WIRELESS_ENC
73fi
74
75if [ -n "$IF_WIRELESS_KEY" ]; then
76 eval $IWCONFIG "$IFACE" key $IF_WIRELESS_KEY
77fi
78
79if [ -n "$IF_WIRELESS_KEY1" ]; then
80 $IWCONFIG "$IFACE" key [1] "$IF_WIRELESS_KEY1"
81fi
82
83if [ -n "$IF_WIRELESS_KEY2" ]; then
84 $IWCONFIG "$IFACE" key [2] "$IF_WIRELESS_KEY2"
85fi
86
87if [ -n "$IF_WIRELESS_KEY3" ]; then
88 $IWCONFIG "$IFACE" key [3] "$IF_WIRELESS_KEY3"
89fi
90
91if [ -n "$IF_WIRELESS_KEY4" ]; then
92 $IWCONFIG "$IFACE" key [4] "$IF_WIRELESS_KEY4"
93fi
94
95if [ -n "$IF_WIRELESS_DEFAULTKEY" ]; then
96 $IWCONFIG "$IFACE" key ["$IF_WIRELESS_DEFAULTKEY"]
97fi
98
99if [ -n "$IF_WIRELESS_KEYMODE" ]; then
100 $IWCONFIG "$IFACE" key "$IF_WIRELESS_KEYMODE"
101fi
102
103if [ -n "$IF_WIRELESS_MODE" ]; then
104 $IWCONFIG "$IFACE" mode $IF_WIRELESS_MODE
105fi
106
107if [ -n "$IF_WIRELESS_FREQ" ]; then
108 $IWCONFIG "$IFACE" freq $IF_WIRELESS_FREQ
109fi
110
111if [ -n "$IF_WIRELESS_CHANNEL" ]; then
112 $IWCONFIG "$IFACE" channel $IF_WIRELESS_CHANNEL
113fi
114
115if [ -n "$IF_WIRELESS_ESSID" ]; then
116 $IWCONFIG "$IFACE" essid "$IF_WIRELESS_ESSID"
117fi
118
119if [ -n "$IF_WIRELESS_COMMIT" ]; then
120 $IWCONFIG "$IFACE" commit
121fi
122
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up b/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
new file mode 100644
index 0000000..4c8e95b
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
@@ -0,0 +1,34 @@
1#!/bin/sh
2#
3# /etc/network/if-pre-up.d/zzz-wireless
4# by Stefan Tomanek (stefan@pico.ruhr.de)
5
6
7IWCONFIG=/sbin/iwconfig
8IFCONFIG=/sbin/ifconfig
9GREP=/bin/grep
10LOGGER=/usr/bin/logger
11SLEEP=/bin/sleep
12
13# How long do we wait for association?
14RETRIES=15
15SLEEPTIME=1
16
17# Only sleep if we use DHCP (add others methods seperated by spaces)
18ONLY_FOR="static dhcp"
19
20if [ -z "$IF_WIRELESS_TYPE" ] && echo "$ONLY_FOR" | grep -q "$METHOD" ; then
21 $IFCONFIG $IFACE up
22 $LOGGER Checking for WLAN association...
23 while ( [ $RETRIES -gt 0 ] && ($IWCONFIG "$IFACE" | $GREP -q "Access Point: Not-Associated") ); do
24 $LOGGER No association yet, $RETRIES retries until timeout
25 RETRIES=$(($RETRIES-1))
26 $SLEEP $SLEEPTIME
27 done
28
29 if [ $RETRIES -eq 0 ]; then
30 $LOGGER Timeout waiting for association, continuing anyway...
31 else
32 $LOGGER Found association!
33 fi
34fi