diff options
| -rw-r--r-- | openembedded/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up | 34 | ||||
| -rw-r--r-- | openembedded/packages/wireless-tools/wireless-tools_26.bb | 35 | ||||
| -rw-r--r-- | openembedded/packages/wireless-tools/wireless-tools_29-pre10.bb (renamed from openembedded/packages/wireless-tools/wireless-tools_27.bb) | 16 |
3 files changed, 42 insertions, 43 deletions
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 <mickey@Vanille.de>" -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_29-pre10.bb index c3d654b0c..c961a25f8 100644 --- a/openembedded/packages/wireless-tools/wireless-tools_27.bb +++ b/openembedded/packages/wireless-tools/wireless-tools_29-pre10.bb @@ -2,16 +2,15 @@ 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 <mickey@Vanille.de>" 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}" +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' \ @@ -24,16 +23,17 @@ do_compile() { oe_runmake all libiw.a } -do_stage () { +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 + 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" |