diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-06-08 20:46:03 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-17 14:59:47 +0100 |
commit | 46d1a0175c28aed234e628c325655d0ce787d4cc (patch) | |
tree | b73bb8874d4466a810dafb293bf5f186d2845fe2 /recipes-connectivity/wireless-tools/wireless-tools | |
parent | eef7735e187473ec5338c853bbb0b3fae7df4795 (diff) |
wireless-tools: re-add from openembedded-core
wireless-tools got removed from openembedded-core but the package libiw
from the recipe is required for lxde panel. Re-add it here.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-connectivity/wireless-tools/wireless-tools')
4 files changed, 77 insertions, 0 deletions
diff --git a/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch b/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch new file mode 100644 index 0000000..f34e243 --- /dev/null +++ b/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch @@ -0,0 +1,21 @@ +wireless_tools: Avoid stripping iwmulticall + +Upstream-Status: Inappropriate [other] + The removed code was from upstream. + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +diff -ur wireless_tools.29.orig/Makefile wireless_tools.29/Makefile +--- wireless_tools.29.orig/Makefile 2011-06-18 11:35:12.183907453 -0500 ++++ wireless_tools.29/Makefile 2011-06-18 11:38:09.995907985 -0500 +@@ -135,9 +135,8 @@ + + macaddr: macaddr.o $(IWLIB) + +-# Always do symbol stripping here + iwmulticall: iwmulticall.o +- $(CC) $(LDFLAGS) -Wl,-s $(XCFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS) + + # It's a kind of magic... + wireless.h: diff --git a/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch b/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch new file mode 100644 index 0000000..6c0d8cb --- /dev/null +++ b/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch @@ -0,0 +1,22 @@ +wireless-tools: Remove QA warning: No GNU_HASH in the elf binary + +Upstream-Status: Inappropriate [other] + Useful within bitbake environment only. + +Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- wireless_tools.29.orig/Makefile ++++ wireless_tools.29/Makefile +@@ -144,7 +144,7 @@ wireless.h: + + # Compilation of the dynamic library + $(DYNAMIC): $(OBJS:.o=.so) +- $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^ ++ $(CC) -shared -o $@ -Wl,-soname,$@ $(LDFLAGS) $(STRIPFLAGS) $(LIBS) -lc $^ + + # Compilation of the static library + $(STATIC): $(OBJS:.o=.so) diff --git a/recipes-connectivity/wireless-tools/wireless-tools/man.patch b/recipes-connectivity/wireless-tools/wireless-tools/man.patch new file mode 100644 index 0000000..6a757da --- /dev/null +++ b/recipes-connectivity/wireless-tools/wireless-tools/man.patch @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate [configuration] + +Index: wireless_tools.30/Makefile +=================================================================== +--- wireless_tools.30.orig/Makefile 2014-02-01 00:21:04.148463382 -0800 ++++ wireless_tools.30/Makefile 2014-02-01 00:23:35.448072279 -0800 +@@ -76,7 +76,7 @@ + INSTALL_DIR= $(PREFIX)/sbin + INSTALL_LIB= $(PREFIX)/lib + INSTALL_INC= $(PREFIX)/include +-INSTALL_MAN= $(PREFIX)/man ++INSTALL_MAN= $(PREFIX)/share/man + + # Various commands + RM = rm -f diff --git a/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch b/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch new file mode 100644 index 0000000..3a22c3f --- /dev/null +++ b/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch @@ -0,0 +1,19 @@ +When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache +(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call +touch */libstdc++.so && /sbin/ldconfig to fix it. + +So remove ldconfig call from make install-libs + +Upstream-Status: Inappropriate [disable feature] + +diff -uNr wireless_tools.29.orig/Makefile wireless_tools.29/Makefile +--- wireless_tools.29.orig/Makefile 2007-09-18 01:56:46.000000000 +0200 ++++ wireless_tools.29/Makefile 2012-02-15 20:46:41.780763514 +0100 +@@ -163,7 +163,6 @@ + install -m 755 $(DYNAMIC) $(INSTALL_LIB) + ln -sfn $(DYNAMIC) $(INSTALL_LIB)/$(DYNAMIC_LINK) + @echo "*** Don't forget to add $(INSTALL_LIB) to /etc/ld.so.conf, and run ldconfig as root. ***" +- @$(LDCONFIG) || echo "*** Could not run ldconfig ! ***" + + # Install the static library + install-static:: $(STATIC) |