summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-02-01 00:51:17 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 22:37:41 +0000
commit9341575733a35df6adc715b774555ac83c0c9f77 (patch)
tree04bb089524e2bc1d3eb31bf7da7a4339774ba7d7
parent0deebd1a6bc22c70cd4885cc3042f778d1749789 (diff)
downloadpoky-9341575733a35df6adc715b774555ac83c0c9f77.tar.gz
wireless-tools: Upgrade 29 -> 30.pre9
This also fixes the underlinking problems that are unearthed with newer binutils 2.24 where one of the wireless-tools libraries is asking for symbols from libm but all the symbols it asks for are unfortunately weak and they do not let new linker convince enough to link libm even though -lm is on cmdline since we are using --as-needed by default in linker, which means we end up with errors like | make: *** [iwconfig] Error 1 | libiw.so.30: undefined reference to `ceil' | libiw.so.30: undefined reference to `pow' | libiw.so.30: undefined reference to `log10' | libiw.so.30: undefined reference to `floor' | collect2: error: ld returned 1 exit status (From OE-Core rev: e347b6b119f83a29802ae4499ddcb3ff6a23b317) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch24
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb (renamed from meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb)22
2 files changed, 23 insertions, 23 deletions
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
index 8e16215ff6..6a757dae76 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
@@ -1,15 +1,15 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2 2
3--- wireless_tools.26/Makefile.orig 2003-06-18 03:38:58.000000000 +0200 3Index: wireless_tools.30/Makefile
4+++ wireless_tools.26/Makefile 2004-07-03 23:35:29.000000000 +0200 4===================================================================
5@@ -57,8 +57,8 @@ 5--- wireless_tools.30.orig/Makefile 2014-02-01 00:21:04.148463382 -0800
6 # Install directories 6+++ wireless_tools.30/Makefile 2014-02-01 00:23:35.448072279 -0800
7 INSTALL_DIR= $(PREFIX)/sbin/ 7@@ -76,7 +76,7 @@
8 INSTALL_LIB= $(PREFIX)/lib/ 8 INSTALL_DIR= $(PREFIX)/sbin
9-INSTALL_INC= $(PREFIX)/include/ 9 INSTALL_LIB= $(PREFIX)/lib
10-INSTALL_MAN= $(PREFIX)/man/ 10 INSTALL_INC= $(PREFIX)/include
11+INSTALL_INC= $(PREFIX)/usr/include/ 11-INSTALL_MAN= $(PREFIX)/man
12+INSTALL_MAN= $(PREFIX)/usr/share/man/ 12+INSTALL_MAN= $(PREFIX)/share/man
13 13
14 # Use local header if the version of wireless extensions is specified 14 # Various commands
15 ifdef FORCE_WEXT_VERSION 15 RM = rm -f
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
index 3aef24ec4c..26ecdf3b40 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
@@ -7,19 +7,19 @@ 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 = "r4"
11 10
12SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \ 11SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \
13 file://remove.ldconfig.call.patch \ 12 file://wireless-tools.if-pre-up \
14 file://man.patch \ 13 file://zzz-wireless.if-pre-up \
15 file://wireless-tools.if-pre-up \ 14 file://remove.ldconfig.call.patch \
16 file://zzz-wireless.if-pre-up \ 15 file://man.patch \
17 file://avoid_strip.patch \ 16 file://avoid_strip.patch \
18 file://ldflags.patch" 17 file://ldflags.patch \
18 "
19SRC_URI[md5sum] = "ca91ba7c7eff9bfff6926b1a34a4697d"
20SRC_URI[sha256sum] = "abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63"
19 21
20SRC_URI[md5sum] = "e06c222e186f7cc013fd272d023710cb" 22S = "${WORKDIR}/wireless_tools.30"
21SRC_URI[sha256sum] = "6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1"
22S = "${WORKDIR}/wireless_tools.29"
23 23
24CFLAGS =+ "-I${S}" 24CFLAGS =+ "-I${S}"
25EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \ 25EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \