From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../wireless-tools/wireless-tools/fixheaders.patch | 34 ++++++ .../wireless-tools/wireless-tools/man.patch | 13 +++ .../wireless-tools/wireless-tools.if-pre-up | 122 +++++++++++++++++++++ .../wireless-tools/zzz-wireless.if-pre-up | 34 ++++++ .../wireless-tools/wireless-tools_28-pre6.bb | 43 ++++++++ .../wireless-tools/wireless-tools_29-pre10.bb | 44 ++++++++ 6 files changed, 290 insertions(+) create mode 100644 meta/packages/wireless-tools/wireless-tools/fixheaders.patch create mode 100644 meta/packages/wireless-tools/wireless-tools/man.patch create mode 100755 meta/packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up create mode 100644 meta/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up create mode 100644 meta/packages/wireless-tools/wireless-tools_28-pre6.bb create mode 100644 meta/packages/wireless-tools/wireless-tools_29-pre10.bb (limited to 'meta/packages/wireless-tools') diff --git a/meta/packages/wireless-tools/wireless-tools/fixheaders.patch b/meta/packages/wireless-tools/wireless-tools/fixheaders.patch new file mode 100644 index 000000000..670804e50 --- /dev/null +++ b/meta/packages/wireless-tools/wireless-tools/fixheaders.patch @@ -0,0 +1,34 @@ +Index: wireless_tools.27/wireless.17.h +=================================================================== +--- wireless_tools.27.orig/wireless.17.h 2004-08-27 15:04:41.000000000 -0400 ++++ wireless_tools.27/wireless.17.h 2005-01-19 21:13:25.343064024 -0500 +@@ -71,9 +71,9 @@ + + /* To minimise problems in user space, I might remove those headers + * at some point. Jean II */ +-#include /* for "caddr_t" et al */ +-#include /* for "struct sockaddr" et al */ +-#include /* for IFNAMSIZ and co... */ ++#include /* for "caddr_t" et al */ ++#include /* for "struct sockaddr" et al */ ++#include /* for IFNAMSIZ and co... */ + + /***************************** VERSION *****************************/ + /* +Index: wireless_tools.27/iwlib.h +=================================================================== +--- wireless_tools.27.orig/iwlib.h 2004-10-28 20:09:47.000000000 -0400 ++++ wireless_tools.27/iwlib.h 2005-01-19 21:13:47.438704976 -0500 +@@ -123,9 +123,9 @@ + #endif /* LIBC5_HEADERS */ + + /* Those 3 headers were previously included in wireless.h */ +-#include /* for "caddr_t" et al */ +-#include /* for "struct sockaddr" et al */ +-#include /* for IFNAMSIZ and co... */ ++#include /* for "caddr_t" et al */ ++#include /* for "struct sockaddr" et al */ ++#include /* for IFNAMSIZ and co... */ + + /* Private copy of Wireless extensions */ + #include diff --git a/meta/packages/wireless-tools/wireless-tools/man.patch b/meta/packages/wireless-tools/wireless-tools/man.patch new file mode 100644 index 000000000..fd8cf4277 --- /dev/null +++ b/meta/packages/wireless-tools/wireless-tools/man.patch @@ -0,0 +1,13 @@ +--- 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/ + + # Use local header if the version of wireless extensions is specified + ifdef FORCE_WEXT_VERSION diff --git a/meta/packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up b/meta/packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up new file mode 100755 index 000000000..11fbced46 --- /dev/null +++ b/meta/packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up @@ -0,0 +1,122 @@ +#!/bin/sh + +case "$METHOD" in loopback) exit 0 ;; esac + +IWCONFIG=/sbin/iwconfig +IWPRIV=/sbin/iwpriv + +if [ ! -x $IWCONFIG ]; then + exit 0 +fi + +# Detect and do nothing for linux-wlan-ng interfaces; +# which are configured by thier own if-pre-up script. +if [ -n "$IF_WIRELESS_TYPE" -a "$IF_WIRELESS_TYPE" = "wlan-ng" ]; then + exit 0 +fi + +if [ -n "$IF_NEEDS_RESET" ]; then + $IWPRIV "$IFACE" reset 1 + sleep 1 +fi + +if [ -n "$IF_NEEDS_FIRMWARE" ]; then + $IF_NEEDS_FIRMWARE "$IFACE" +fi + +if [ -n "$IF_WIRELESS_SENS" ]; then + $IWCONFIG "$IFACE" sens $IF_WIRELESS_SENS +fi + +if [ -n "$IF_WIRELESS_RATE" ]; then + $IWCONFIG "$IFACE" rate $IF_WIRELESS_RATE +fi + +if [ -n "$IF_WIRELESS_RTS" ]; then + $IWCONFIG "$IFACE" rts $IF_WIRELESS_RTS +fi + +if [ -n "$IF_WIRELESS_FRAG" ]; then + $IWCONFIG "$IFACE" frag $IF_WIRELESS_FRAG +fi + +if [ -n "$IF_WIRELESS_POWER" ]; then + $IWCONFIG "$IFACE" power $IF_WIRELESS_POWER +fi + +if [ -n "$IF_WIRELESS_POWERPERIOD" ]; then + $IWCONFIG "$IFACE" power period $IF_WIRELESS_POWERPERIOD +fi + +if [ -n "$IF_WIRELESS_POWERTIMEOUT" ]; then + $IWCONFIG "$IFACE" power timeout $IF_WIRELESS_POWERTIMEOUT +fi + +if [ -n "$IF_WIRELESS_TXPOWER" ]; then + $IWCONFIG "$IFACE" txpower $IF_WIRELESS_TXPOWER +fi + +if [ -n "$IF_WIRELESS_RETRY" ]; then + $IWCONFIG "$IFACE" retry $IF_WIRELESS_RETRY +fi + +if [ -n "$IF_WIRELESS_ESSID" ]; then + $IWCONFIG "$IFACE" essid "$IF_WIRELESS_ESSID" +fi + +if [ -n "$IF_WIRELESS_NICK" ]; then + $IWCONFIG "$IFACE" nick "$IF_WIRELESS_NICK" +fi + +if [ -n "$IF_WIRELESS_NWID" ]; then + $IWCONFIG "$IFACE" nwid "$IF_WIRELESS_NWID" +fi + +if [ -n "$IF_WIRELESS_ENC" ]; then + eval $IWCONFIG "$IFACE" enc $IF_WIRELESS_ENC +fi + +if [ -n "$IF_WIRELESS_KEY" ]; then + eval $IWCONFIG "$IFACE" key $IF_WIRELESS_KEY +fi + +if [ -n "$IF_WIRELESS_KEY1" ]; then + $IWCONFIG "$IFACE" key [1] "$IF_WIRELESS_KEY1" +fi + +if [ -n "$IF_WIRELESS_KEY2" ]; then + $IWCONFIG "$IFACE" key [2] "$IF_WIRELESS_KEY2" +fi + +if [ -n "$IF_WIRELESS_KEY3" ]; then + $IWCONFIG "$IFACE" key [3] "$IF_WIRELESS_KEY3" +fi + +if [ -n "$IF_WIRELESS_KEY4" ]; then + $IWCONFIG "$IFACE" key [4] "$IF_WIRELESS_KEY4" +fi + +if [ -n "$IF_WIRELESS_DEFAULTKEY" ]; then + $IWCONFIG "$IFACE" key ["$IF_WIRELESS_DEFAULTKEY"] +fi + +if [ -n "$IF_WIRELESS_KEYMODE" ]; then + $IWCONFIG "$IFACE" key "$IF_WIRELESS_KEYMODE" +fi + +if [ -n "$IF_WIRELESS_MODE" ]; then + $IWCONFIG "$IFACE" mode $IF_WIRELESS_MODE +fi + +if [ -n "$IF_WIRELESS_FREQ" ]; then + $IWCONFIG "$IFACE" freq $IF_WIRELESS_FREQ +fi + +if [ -n "$IF_WIRELESS_CHANNEL" ]; then + $IWCONFIG "$IFACE" channel $IF_WIRELESS_CHANNEL +fi + +if [ -n "$IF_WIRELESS_COMMIT" ]; then + $IWCONFIG "$IFACE" commit +fi + diff --git a/meta/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up b/meta/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up new file mode 100644 index 000000000..4c8e95bf2 --- /dev/null +++ b/meta/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/meta/packages/wireless-tools/wireless-tools_28-pre6.bb b/meta/packages/wireless-tools/wireless-tools_28-pre6.bb new file mode 100644 index 000000000..f230cd307 --- /dev/null +++ b/meta/packages/wireless-tools/wireless-tools_28-pre6.bb @@ -0,0 +1,43 @@ +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.pre6.tar.gz \ + file://man.patch;patch=1 \ + file://fixheaders.patch;patch=1 \ + file://wireless-tools.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 +} + +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/meta/packages/wireless-tools/wireless-tools_29-pre10.bb b/meta/packages/wireless-tools/wireless-tools_29-pre10.bb new file mode 100644 index 000000000..c961a25f8 --- /dev/null +++ b/meta/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