summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-12 15:24:41 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-12 15:24:41 +0000
commit9ddd9dcefa6c1c0788151be43ee844b13ef1dd8a (patch)
treee93eb7ee59eb25cf282176112ffc5b92949e58a9
parentdd126d2256e1835e17037aab7cc15cfc79ebd113 (diff)
downloadpoky-9ddd9dcefa6c1c0788151be43ee844b13ef1dd8a.tar.gz
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
-rw-r--r--openembedded/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up34
-rw-r--r--openembedded/packages/wireless-tools/wireless-tools_26.bb35
-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 0000000000..4c8e95bf2a
--- /dev/null
+++ b/openembedded/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
@@ -0,0 +1,34 @@
1#!/bin/sh
2#
3# /etc/network/if-pre-up.d/zzz-wireless
4# by Stefan Tomanek (stefan@pico.ruhr.de)
5
6
7IWCONFIG=/sbin/iwconfig
8IFCONFIG=/sbin/ifconfig
9GREP=/bin/grep
10LOGGER=/usr/bin/logger
11SLEEP=/bin/sleep
12
13# How long do we wait for association?
14RETRIES=15
15SLEEPTIME=1
16
17# Only sleep if we use DHCP (add others methods seperated by spaces)
18ONLY_FOR="static dhcp"
19
20if [ -z "$IF_WIRELESS_TYPE" ] && echo "$ONLY_FOR" | grep -q "$METHOD" ; then
21 $IFCONFIG $IFACE up
22 $LOGGER Checking for WLAN association...
23 while ( [ $RETRIES -gt 0 ] && ($IWCONFIG "$IFACE" | $GREP -q "Access Point: Not-Associated") ); do
24 $LOGGER No association yet, $RETRIES retries until timeout
25 RETRIES=$(($RETRIES-1))
26 $SLEEP $SLEEPTIME
27 done
28
29 if [ $RETRIES -eq 0 ]; then
30 $LOGGER Timeout waiting for association, continuing anyway...
31 else
32 $LOGGER Found association!
33 fi
34fi
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 f0f29bf608..0000000000
--- a/openembedded/packages/wireless-tools/wireless-tools_26.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
2HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
3SECTION = "base"
4PRIORITY = "optional"
5DEPENDS = "virtual/kernel"
6MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
7LICENSE = "GPL"
8PR = "r6"
9
10SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
11 file://man.patch;patch=1 \
12 file://wireless-tools.if-pre-up"
13S = "${WORKDIR}/wireless_tools.${PV}"
14
15inherit module-base
16
17do_configure() {
18 rm -f wireless.h
19}
20
21do_compile() {
22 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
23 oe_runmake KERNEL_SRC=${KERNEL_SOURCE} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y
24}
25
26do_install() {
27 oe_runmake PREFIX=${D} install
28 install -d ${D}${sysconfdir}/network/if-pre-up.d
29 install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
30}
31
32FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
33 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
34 /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
35 /etc/network"
diff --git a/openembedded/packages/wireless-tools/wireless-tools_27.bb b/openembedded/packages/wireless-tools/wireless-tools_29-pre10.bb
index c3d654b0c9..c961a25f83 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"
2HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" 2HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
3SECTION = "base" 3SECTION = "base"
4PRIORITY = "optional" 4PRIORITY = "optional"
5#DEPENDS = "virtual/kernel"
6MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" 5MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
7LICENSE = "GPL" 6LICENSE = "GPL"
8PR = "r1" 7PR = "r1"
9 8
10SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \ 9SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre13.tar.gz \
11 file://man.patch;patch=1 \ 10 file://man.patch;patch=1 \
12 file://fixheaders.patch;patch=1 \ 11 file://wireless-tools.if-pre-up \
13 file://wireless-tools.if-pre-up" 12 file://zzz-wireless.if-pre-up"
14S = "${WORKDIR}/wireless_tools.${PV}" 13S = "${WORKDIR}/wireless_tools.28"
15 14
16CFLAGS =+ "-I${S}" 15CFLAGS =+ "-I${S}"
17EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \ 16EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
@@ -24,16 +23,17 @@ do_compile() {
24 oe_runmake all libiw.a 23 oe_runmake all libiw.a
25} 24}
26 25
27do_stage () { 26do_stage() {
28 install -m 0644 wireless.h ${STAGING_INCDIR}/ 27 install -m 0644 wireless.h ${STAGING_INCDIR}/
29 install -m 0644 iwlib.h ${STAGING_INCDIR}/ 28 install -m 0644 iwlib.h ${STAGING_INCDIR}/
30 oe_libinstall -a -so libiw ${STAGING_LIBDIR}/ 29 oe_libinstall -a -so libiw ${STAGING_LIBDIR}/
31} 30}
32 31
33do_install() { 32do_install() {
34 oe_runmake PREFIX=${D} install install-static 33 oe_runmake PREFIX=${D} install-iwmulticall install-dynamic
35 install -d ${D}${sysconfdir}/network/if-pre-up.d 34 install -d ${D}${sysconfdir}/network/if-pre-up.d
36 install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools 35 install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
36 install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless
37} 37}
38 38
39PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc" 39PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"