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
4 files changed, 0 insertions, 77 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
deleted file mode 100644
index f34e243de9..0000000000
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
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
deleted file mode 100644
index 6c0d8cbd2e..0000000000
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
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
deleted file mode 100644
index 6a757dae76..0000000000
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
+++ /dev/null
@@ -1,15 +0,0 @@
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
deleted file mode 100644
index 3a22c3f1e7..0000000000
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
+++ /dev/null
@@ -1,19 +0,0 @@
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)