From 9ddd9dcefa6c1c0788151be43ee844b13ef1dd8a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 12 Jul 2006 15:24:41 +0000 Subject: wireless tools: Update 28-pre6 to 29-pre10 to work with 2.6.17 kernel git-svn-id: https://svn.o-hand.com/repos/poky/trunk@511 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../wireless-tools/zzz-wireless.if-pre-up | 34 +++++++++++++++++ .../packages/wireless-tools/wireless-tools_26.bb | 35 ----------------- .../packages/wireless-tools/wireless-tools_27.bb | 44 ---------------------- .../wireless-tools/wireless-tools_29-pre10.bb | 44 ++++++++++++++++++++++ 4 files changed, 78 insertions(+), 79 deletions(-) create mode 100644 openembedded/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up delete mode 100644 openembedded/packages/wireless-tools/wireless-tools_26.bb delete mode 100644 openembedded/packages/wireless-tools/wireless-tools_27.bb create mode 100644 openembedded/packages/wireless-tools/wireless-tools_29-pre10.bb (limited to 'openembedded') diff --git a/openembedded/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up b/openembedded/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up new file mode 100644 index 000000000..4c8e95bf2 --- /dev/null +++ b/openembedded/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up @@ -0,0 +1,34 @@ +#!/bin/sh +# +# /etc/network/if-pre-up.d/zzz-wireless +# by Stefan Tomanek (stefan@pico.ruhr.de) + + +IWCONFIG=/sbin/iwconfig +IFCONFIG=/sbin/ifconfig +GREP=/bin/grep +LOGGER=/usr/bin/logger +SLEEP=/bin/sleep + +# How long do we wait for association? +RETRIES=15 +SLEEPTIME=1 + +# Only sleep if we use DHCP (add others methods seperated by spaces) +ONLY_FOR="static dhcp" + +if [ -z "$IF_WIRELESS_TYPE" ] && echo "$ONLY_FOR" | grep -q "$METHOD" ; then + $IFCONFIG $IFACE up + $LOGGER Checking for WLAN association... + while ( [ $RETRIES -gt 0 ] && ($IWCONFIG "$IFACE" | $GREP -q "Access Point: Not-Associated") ); do + $LOGGER No association yet, $RETRIES retries until timeout + RETRIES=$(($RETRIES-1)) + $SLEEP $SLEEPTIME + done + + if [ $RETRIES -eq 0 ]; then + $LOGGER Timeout waiting for association, continuing anyway... + else + $LOGGER Found association! + fi +fi diff --git a/openembedded/packages/wireless-tools/wireless-tools_26.bb b/openembedded/packages/wireless-tools/wireless-tools_26.bb deleted file mode 100644 index f0f29bf60..000000000 --- a/openembedded/packages/wireless-tools/wireless-tools_26.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem" -HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "virtual/kernel" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -PR = "r6" - -SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \ - file://man.patch;patch=1 \ - file://wireless-tools.if-pre-up" -S = "${WORKDIR}/wireless_tools.${PV}" - -inherit module-base - -do_configure() { - rm -f wireless.h -} - -do_compile() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KERNEL_SRC=${KERNEL_SOURCE} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y -} - -do_install() { - oe_runmake PREFIX=${D} install - 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 -} - -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \ - /etc/network" diff --git a/openembedded/packages/wireless-tools/wireless-tools_27.bb b/openembedded/packages/wireless-tools/wireless-tools_27.bb deleted file mode 100644 index c3d654b0c..000000000 --- a/openembedded/packages/wireless-tools/wireless-tools_27.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem" -HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" -SECTION = "base" -PRIORITY = "optional" -#DEPENDS = "virtual/kernel" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \ - file://man.patch;patch=1 \ - file://fixheaders.patch;patch=1 \ - file://wireless-tools.if-pre-up" -S = "${WORKDIR}/wireless_tools.${PV}" - -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_stage () { - install -m 0644 wireless.h ${STAGING_INCDIR}/ - install -m 0644 iwlib.h ${STAGING_INCDIR}/ - oe_libinstall -a -so libiw ${STAGING_LIBDIR}/ -} - -do_install() { - oe_runmake PREFIX=${D} install install-static - 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 -} - -PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc" -FILES_libiw = "${libdir}/*.so.*" -FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" -FILES_libiw-doc = "${mandir}/man7" -FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network" -FILES_${PN}-doc = "${mandir}/man8" diff --git a/openembedded/packages/wireless-tools/wireless-tools_29-pre10.bb b/openembedded/packages/wireless-tools/wireless-tools_29-pre10.bb new file mode 100644 index 000000000..c961a25f8 --- /dev/null +++ b/openembedded/packages/wireless-tools/wireless-tools_29-pre10.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem" +HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre13.tar.gz \ + file://man.patch;patch=1 \ + file://wireless-tools.if-pre-up \ + file://zzz-wireless.if-pre-up" +S = "${WORKDIR}/wireless_tools.28" + +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_stage() { + install -m 0644 wireless.h ${STAGING_INCDIR}/ + install -m 0644 iwlib.h ${STAGING_INCDIR}/ + oe_libinstall -a -so libiw ${STAGING_LIBDIR}/ +} + +do_install() { + oe_runmake PREFIX=${D} install-iwmulticall install-dynamic + 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 libiw-dev libiw-doc ${PN} ${PN}-doc" +FILES_libiw = "${libdir}/*.so.*" +FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" +FILES_libiw-doc = "${mandir}/man7" +FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network" +FILES_${PN}-doc = "${mandir}/man8" -- cgit v1.2.3