summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/wireless-tools
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-02-15 19:59:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:59:35 (GMT)
commita6fb1939c132986a859fe8d2a876919d82683eea (patch)
tree7a4a0aa817b76415444439e2f6ef770ff5fd5cfb /meta/recipes-connectivity/wireless-tools
parentdaeb5beb8f88e0ca6d0449909deb744136040740 (diff)
downloadpoky-a6fb1939c132986a859fe8d2a876919d82683eea.tar.gz
wireless-tools: remove ldconfig call from install-libs
* and drop apply=yes param as it's not needed (From OE-Core rev: ca343882f8e95b49b18b234000e387c879cf5885) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/wireless-tools')
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch19
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb5
2 files changed, 22 insertions, 2 deletions
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_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index cc51dec..c6235d6 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6" 7 file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
8SECTION = "base" 8SECTION = "base"
9PE = "1" 9PE = "1"
10PR = "r2" 10PR = "r3"
11 11
12SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \ 12SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
13 file://man.patch;apply=yes \ 13 file://remove.ldconfig.call.patch \
14 file://man.patch \
14 file://wireless-tools.if-pre-up \ 15 file://wireless-tools.if-pre-up \
15 file://zzz-wireless.if-pre-up \ 16 file://zzz-wireless.if-pre-up \
16 file://avoid_strip.patch" 17 file://avoid_strip.patch"