diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-05-21 12:37:30 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-29 21:07:14 +0100 |
commit | f7137f94905c0d0ef1c0af8e53db18de00a17fec (patch) | |
tree | 6721b41b97a5225d7ef3ebdf17ec2d11b21dd96c /meta/recipes-connectivity | |
parent | 960f25795f2c56a287e71e9327d0a43fa9aff18c (diff) | |
download | poky-f7137f94905c0d0ef1c0af8e53db18de00a17fec.tar.gz |
wireless-tools: remove the recipe
wireless-tools have been obsolete and superseded by iw for a very long time.
I've checked that images continue to boot and the graphical connman frontend
is still able to list wireless networks; there is no evidence that
wireless-tools are needed by anything.
[YOCTO #12727]
(From OE-Core rev: f1978b7e1d68bd7813ae048ff9a37716618a473c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
5 files changed, 0 insertions, 127 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 @@ | |||
1 | wireless_tools: Avoid stripping iwmulticall | ||
2 | |||
3 | Upstream-Status: Inappropriate [other] | ||
4 | The removed code was from upstream. | ||
5 | |||
6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
7 | |||
8 | diff -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 @@ | |||
1 | wireless-tools: Remove QA warning: No GNU_HASH in the elf binary | ||
2 | |||
3 | Upstream-Status: Inappropriate [other] | ||
4 | Useful within bitbake environment only. | ||
5 | |||
6 | Signed-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 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: 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 @@ | |||
1 | When /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 | ||
3 | touch */libstdc++.so && /sbin/ldconfig to fix it. | ||
4 | |||
5 | So remove ldconfig call from make install-libs | ||
6 | |||
7 | Upstream-Status: Inappropriate [disable feature] | ||
8 | |||
9 | diff -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_30.pre9.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb deleted file mode 100644 index 0a342071e0..0000000000 --- a/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | SUMMARY = "Tools for the Linux Standard Wireless Extension Subsystem" | ||
2 | HOMEPAGE = "https://hewlettpackard.github.io/wireless-tools/Tools.html" | ||
3 | LICENSE = "GPLv2 & (LGPLv2.1 | MPL-1.1 | BSD)" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
5 | file://iwconfig.c;beginline=1;endline=12;md5=cf710eb1795c376eb10ea4ff04649caf \ | ||
6 | file://iwevent.c;beginline=59;endline=72;md5=d66a10026d4394f0a5b1c5587bce4537 \ | ||
7 | file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6" | ||
8 | SECTION = "base" | ||
9 | PE = "1" | ||
10 | |||
11 | SRC_URI = "https://hewlettpackard.github.io/wireless-tools/wireless_tools.${PV}.tar.gz \ | ||
12 | file://remove.ldconfig.call.patch \ | ||
13 | file://man.patch \ | ||
14 | file://avoid_strip.patch \ | ||
15 | file://ldflags.patch \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "ca91ba7c7eff9bfff6926b1a34a4697d" | ||
18 | SRC_URI[sha256sum] = "abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63" | ||
19 | |||
20 | UPSTREAM_CHECK_URI = "https://hewlettpackard.github.io/wireless-tools/Tools.html" | ||
21 | UPSTREAM_CHECK_REGEX = "wireless_tools\.(?P<pver>(\d+)(\..*|))\.tar\.gz" | ||
22 | |||
23 | S = "${WORKDIR}/wireless_tools.30" | ||
24 | |||
25 | CFLAGS =+ "-I${S}" | ||
26 | EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \ | ||
27 | 'INSTALL_DIR=${D}${base_sbindir}' \ | ||
28 | 'INSTALL_LIB=${D}${libdir}' \ | ||
29 | 'INSTALL_INC=${D}${includedir}' \ | ||
30 | 'INSTALL_MAN=${D}${mandir}'" | ||
31 | |||
32 | do_compile() { | ||
33 | oe_runmake all libiw.a | ||
34 | } | ||
35 | |||
36 | do_install() { | ||
37 | oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr | ||
38 | install -d ${D}${sbindir} | ||
39 | install -m 0755 ifrename ${D}${sbindir}/ifrename | ||
40 | } | ||
41 | |||
42 | PACKAGES = "libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc ${PN}-dbg" | ||
43 | |||
44 | FILES_libiw = "${libdir}/*.so.*" | ||
45 | FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" | ||
46 | FILES_libiw-doc = "${mandir}/man7" | ||
47 | FILES_ifrename = "${sbindir}/ifrename" | ||
48 | FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" | ||
49 | FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network" | ||
50 | FILES_${PN}-doc = "${mandir}" | ||