From e347b6b119f83a29802ae4499ddcb3ff6a23b317 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 1 Feb 2014 00:51:17 -0800 Subject: 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 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../wireless-tools/wireless-tools/man.patch | 24 +++++----- .../wireless-tools/wireless-tools_29.bb | 56 ---------------------- .../wireless-tools/wireless-tools_30.pre9.bb | 56 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb create mode 100644 meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb 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 @@ Upstream-Status: Inappropriate [configuration] ---- wireless_tools.26/Makefile.orig 2003-06-18 03:38:58.000000000 +0200 -+++ wireless_tools.26/Makefile 2004-07-03 23:35:29.000000000 +0200 -@@ -57,8 +57,8 @@ - # Install directories - INSTALL_DIR= $(PREFIX)/sbin/ - INSTALL_LIB= $(PREFIX)/lib/ --INSTALL_INC= $(PREFIX)/include/ --INSTALL_MAN= $(PREFIX)/man/ -+INSTALL_INC= $(PREFIX)/usr/include/ -+INSTALL_MAN= $(PREFIX)/usr/share/man/ +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 - # Use local header if the version of wireless extensions is specified - ifdef FORCE_WEXT_VERSION + # Various commands + RM = rm -f diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb deleted file mode 100644 index 3aef24ec4c..0000000000 --- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Tools for the Linux Standard Wireless Extension Subsystem" -HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" -LICENSE = "GPLv2 & (LGPLv2.1 | MPL-1.1 | BSD)" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://iwconfig.c;beginline=1;endline=12;md5=cf710eb1795c376eb10ea4ff04649caf \ - file://iwevent.c;beginline=59;endline=72;md5=d66a10026d4394f0a5b1c5587bce4537 \ - file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6" -SECTION = "base" -PE = "1" -PR = "r4" - -SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \ - file://remove.ldconfig.call.patch \ - file://man.patch \ - file://wireless-tools.if-pre-up \ - file://zzz-wireless.if-pre-up \ - file://avoid_strip.patch \ - file://ldflags.patch" - -SRC_URI[md5sum] = "e06c222e186f7cc013fd272d023710cb" -SRC_URI[sha256sum] = "6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1" -S = "${WORKDIR}/wireless_tools.29" - -CFLAGS =+ "-I${S}" -EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \ - 'INSTALL_DIR=${D}${base_sbindir}' \ - 'INSTALL_LIB=${D}${libdir}' \ - 'INSTALL_INC=${D}${includedir}' \ - 'INSTALL_MAN=${D}${mandir}'" - -do_compile() { - oe_runmake all libiw.a -} - -do_install() { - oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr - install -d ${D}${sbindir} - install -m 0755 ifrename ${D}${sbindir}/ifrename - # Disabled by RP - 20/8/08 - We don't seem to need/use these - #install -d ${D}${sysconfdir}/network/if-pre-up.d - #install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools - #install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless -} - -PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \ -libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc" - -FILES_libiw-dbg = "${libdir}/.debug/*.so.*" -FILES_ifrename-dbg = "${sbindir}/.debug/ifrename" -FILES_libiw = "${libdir}/*.so.*" -FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" -FILES_libiw-doc = "${mandir}/man7" -FILES_ifrename = "${sbindir}/ifrename" -FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" -FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network" -FILES_${PN}-doc = "${mandir}" diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb new file mode 100644 index 0000000000..26ecdf3b40 --- /dev/null +++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb @@ -0,0 +1,56 @@ +SUMMARY = "Tools for the Linux Standard Wireless Extension Subsystem" +HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" +LICENSE = "GPLv2 & (LGPLv2.1 | MPL-1.1 | BSD)" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://iwconfig.c;beginline=1;endline=12;md5=cf710eb1795c376eb10ea4ff04649caf \ + file://iwevent.c;beginline=59;endline=72;md5=d66a10026d4394f0a5b1c5587bce4537 \ + file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6" +SECTION = "base" +PE = "1" + +SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \ + file://wireless-tools.if-pre-up \ + file://zzz-wireless.if-pre-up \ + file://remove.ldconfig.call.patch \ + file://man.patch \ + file://avoid_strip.patch \ + file://ldflags.patch \ + " +SRC_URI[md5sum] = "ca91ba7c7eff9bfff6926b1a34a4697d" +SRC_URI[sha256sum] = "abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63" + +S = "${WORKDIR}/wireless_tools.30" + +CFLAGS =+ "-I${S}" +EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \ + 'INSTALL_DIR=${D}${base_sbindir}' \ + 'INSTALL_LIB=${D}${libdir}' \ + 'INSTALL_INC=${D}${includedir}' \ + 'INSTALL_MAN=${D}${mandir}'" + +do_compile() { + oe_runmake all libiw.a +} + +do_install() { + oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr + install -d ${D}${sbindir} + install -m 0755 ifrename ${D}${sbindir}/ifrename + # Disabled by RP - 20/8/08 - We don't seem to need/use these + #install -d ${D}${sysconfdir}/network/if-pre-up.d + #install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools + #install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless +} + +PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \ +libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc" + +FILES_libiw-dbg = "${libdir}/.debug/*.so.*" +FILES_ifrename-dbg = "${sbindir}/.debug/ifrename" +FILES_libiw = "${libdir}/*.so.*" +FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" +FILES_libiw-doc = "${mandir}/man7" +FILES_ifrename = "${sbindir}/ifrename" +FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" +FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network" +FILES_${PN}-doc = "${mandir}" -- cgit v1.2.3