From be8a8aee064feb50cc3dd13a67487c9b95aeee02 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 5 May 2005 14:40:05 +0000 Subject: [PATCH] Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/05 15:39:30+02:00 uni-frankfurt.de!mickeyl fix oesources mirror entry. spotted by Nick Haflinger BKrev: 427a3045Wm9Tmb-X85GBp5HPmFI_4w --- classes/base.bbclass | 4 +- packages/wlan-ng/files/post-down | 31 +++ packages/wlan-ng/files/pre-up | 227 ++++++++++++++++++ packages/wlan-ng/files/resume | 22 ++ packages/wlan-ng/files/usbctl | Bin 0 -> 4040 bytes packages/wlan-ng/files/wlan-ng.modutils | 1 + packages/wlan-ng/files/wlan.agent | 107 +++++++++ .../Ambit_usb.patch | 0 .../OZ-Configure.patch | 0 .../config.in | 0 .../config.mk | 0 .../no-compat.patch | 0 .../pass-kernel-cross.patch | 0 .../scripts-makefile-hostcc.diff | 0 .../version.h | 0 15 files changed, 390 insertions(+), 2 deletions(-) rename packages/wlan-ng/{files => wlan-ng-modules-0.2.1-pre23}/Ambit_usb.patch (100%) rename packages/wlan-ng/{files => wlan-ng-modules-0.2.1-pre23}/OZ-Configure.patch (100%) rename packages/wlan-ng/{files => wlan-ng-modules-0.2.1-pre23}/config.in (100%) rename packages/wlan-ng/{files => wlan-ng-modules-0.2.1-pre23}/config.mk (100%) rename packages/wlan-ng/{files => wlan-ng-modules-0.2.1-pre23}/no-compat.patch (100%) rename packages/wlan-ng/{files => wlan-ng-modules-0.2.1-pre23}/pass-kernel-cross.patch (100%) rename packages/wlan-ng/{files => wlan-ng-modules-0.2.1-pre23}/scripts-makefile-hostcc.diff (100%) rename packages/wlan-ng/{files => wlan-ng-modules-0.2.1-pre23}/version.h (100%) diff --git a/classes/base.bbclass b/classes/base.bbclass index 52dfede863..4c2c58e8d2 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -795,7 +795,7 @@ ftp://ftp.kernel.org/pub ftp://ftp.uk.kernel.org/pub ftp://ftp.kernel.org/pub ftp://ftp.hk.kernel.org/pub ftp://ftp.kernel.org/pub ftp://ftp.au.kernel.org/pub ftp://ftp.kernel.org/pub ftp://ftp.jp.kernel.org/pub -ftp://.*/.*/ http://www.oesources.org/source/current -http://.*/.*/ http://www.oesources.org/source/current +ftp://.*/.*/ http://www.oesources.org/source/current/ +http://.*/.*/ http://www.oesources.org/source/current/ } diff --git a/packages/wlan-ng/files/post-down b/packages/wlan-ng/files/post-down index e69de29bb2..bf4ba0ae60 100644 --- a/packages/wlan-ng/files/post-down +++ b/packages/wlan-ng/files/post-down @@ -0,0 +1,31 @@ +#!/bin/sh +# +# This script takes care of bringing down wlan-ng devices. +# It is run by ifdown. + +WLANCTL=/sbin/wlanctl-ng + +if [ ! -x $WLANCTL ] ; then + exit 0 +fi + +case $IFACE in +wlan?) + # Reset device to make sure it is not trying to generate + # interrupts. + result=`$WLANCTL $IFACE lnxreq_ifstate ifstate=disable` + + # Remove modules. Of course, for all I know they are still in use + # by another interface, in which case these rmmods will fail. Also, + # depending on how modutils is set up, different prism2 modules + # might be loaded. + ( + rmmod prism2_pci || rmmod prism2_cs || rmmod prism2_usb || \ + rmmod prism2_plx || true + rmmod p80211 || true + ) 2>/dev/null + + # Remove lock file, just in case. + rm -f /var/lock/wlan-$IFACE.lock +;; +esac diff --git a/packages/wlan-ng/files/pre-up b/packages/wlan-ng/files/pre-up index e69de29bb2..0ae410edfa 100644 --- a/packages/wlan-ng/files/pre-up +++ b/packages/wlan-ng/files/pre-up @@ -0,0 +1,227 @@ +#!/bin/sh + +case "$METHOD" in loopback) exit 0 ;; esac + +# +# This script takes care of bringing up wlan-ng device. +# It is run by ifup, and gets information from the +# /etc/network/interfaces file. It is derived from the +# init.d/wlan script in the wlan-ng distribution + +WLANCTL=/sbin/wlanctl-ng +PRIV_GENERATOR=/sbin/nwepgen + +if [ ! -x $WLANCTL ] ; then + exit 0 +fi + +# Detect and act only on linux-wlan-ng interfaces +if [ "$IF_WIRELESS_TYPE" != "wlan-ng" ]; then + exit 0 +fi + +# Create a lock file; remove on script exit. This is a fairly crummy lock, +# but all it needs to do is prevent hotplug from calling this script, +# which may happen when the module is loaded below. Since it should only +# happen when the module is loaded, I don't need a proper lock. +if [ -e /var/lock/wlan-$IFACE.lock ]; then + exit 0 +fi +touch /var/lock/wlan-$IFACE.lock +cleanup () { + rm -f /var/lock/wlan-$IFACE.lock +} +trap cleanup 0 + +if [ -z "$IF_WIRELESS_MODE" ]; then + IF_WIRELESS_MODE="ad_hoc" +fi + +if [ -z "$IF_WLAN_NG_HOSTWEP" ]; then + IF_WLAN_NG_HOSTWEP=false +fi + +if [ -z "$IF_WLAN_NG_DEFAULT_KEY_ID" ]; then + IF_WLAN_NG_DEFAULT_KEY_ID=0 +fi + +if [ -z "$IF_WLAN_NG_EXCLUDE_UNENCRYPTED" ]; then + IF_WLAN_NG_EXCLUDE_UNENCRYPTED=true +fi + +if [ -z "$IF_WLAN_NG_PRIV_KEY128" ]; then + IF_WLAN_NG_PRIV_KEY128=false +fi + +if [ -z "$IF_WLAN_NG_BCINT" ]; then + IF_WLAN_NG_BCINT=100 +fi + +if [ -z "$IF_WLAN_NG_BASICRATES" ]; then + IF_WLAN_NG_BASICRATES="2 4" +fi + +if [ -z "$IF_WLAN_NG_OPRATES" ]; then + IF_WLAN_NG_OPRATES="2 4 11 22" +fi + +if [ -z "$IF_WLAN_NG_AUTHTYPE" ]; then + IF_WLAN_NG_AUTHTYPE="opensystem" +fi + +if [ -z "$IF_WIRELESS_CHANNEL" ]; then + IF_WIRELESS_CHANNEL=1 +fi + +if ! modprobe p80211; then + echo "Failed to load p80211.o." >&2 + exit 1 +fi + +# NOTE: We don't explicitly insmod the card driver here. The +# best thing to do is to specify an alias in /etc/modules.conf. +# Then, the first time we call wlanctl with the named device, +# the kernel module autoload stuff will take over. +# But, if you prefer, you could modprobe it here. + + +# Bring the card up into an operable state. +result=`$WLANCTL $IFACE lnxreq_ifstate ifstate=enable` +if [ $? = 0 ] ; then + eval $result + if [ $resultcode != "success" ]; then + echo "Failed to enable the device, resultcode=" $resultcode "." >&2 + exit 1 + fi +else + echo "Failed to enable the device, exitcode=" $? "." >&2 + exit 1 +fi + +# Set user-specified MIB items. +for i in $IF_WLAN_NG_USER_MIBS; do + result=`$WLANCTL $IFACE dot11req_mibset "mibattribute=$i"` + + if [ $? = 0 ] ; then + eval $result + if [ $resultcode != "success" ] ; then + echo "Failed to set user MIB $i." >&2 + exit 1 + fi + else + echo "Failed to set user MIB $i." >&2 + exit 1 + fi +done + +if [ "$IF_WIRELESS_ENC" = "on" ]; then + # Set up WEP. + result=`$WLANCTL $IFACE dot11req_mibget mibattribute=dot11PrivacyOptionImplemented` + if [ $? = 0 ] ; then + eval $result + eval $mibattribute + else + echo "mibget failed." >&2 + exit 1 + fi + + if [ "$dot11PrivacyOptionImplemented" != "true" ]; then + echo "Cannot enable privacy, dot11PrivacyOptionImplemented=$dot11PrivacyOptionImplemented." >&2 + exit 1 + fi + + $WLANCTL $IFACE lnxreq_hostwep decrypt=$IF_WLAN_NG_HOSTWEP encrypt=$IF_WLAN_NG_HOSTWEP >/dev/null + + $WLANCTL $IFACE dot11req_mibset \ + mibattribute=dot11WEPDefaultKeyID=$IF_WLAN_NG_DEFAULT_KEY_ID \ + >/dev/null + + $WLANCTL $IFACE dot11req_mibset \ + mibattribute=dot11ExcludeUnencrypted=$IF_WLAN_NG_EXCLUDE_UNENCRYPTED \ + >/dev/null + + $WLANCTL $IFACE dot11req_mibset \ + mibattribute=dot11PrivacyInvoked=true >/dev/null + + if [ -e "$IF_WLAN_NG_KEYFILE" ]; then + IF_WLAN_NG_PRIV_GENSTR=`cat $IF_WLAN_NG_KEYFILE` + fi + if [ ! -z "$IF_WLAN_NG_PRIV_GENSTR" ]; then + if [ "$IF_WLAN_NG_PRIV_KEY128" = "false" ]; then + keys=`$PRIV_GENERATOR "$IF_WLAN_NG_PRIV_GENSTR" 5` + else + keys=`$PRIV_GENERATOR "$IF_WLAN_NG_PRIV_GENSTR" 13` + fi + + knum=0 + for i in $keys; do + $WLANCTL $IFACE dot11req_mibset \ + mibattribute=dot11WEPDefaultKey$knum=$i \ + >/dev/null + knum=$(expr $knum + 1) + done + else + $WLANCTL $IFACE dot11req_mibset \ + mibattribute=dot11WEPDefaultKey0=$IF_WLAN_NG_KEY0 \ + >/dev/null + $WLANCTL $IFACE dot11req_mibset \ + mibattribute=dot11WEPDefaultKey1=$IF_WLAN_NG_KEY1 \ + >/dev/null + $WLANCTL $IFACE dot11req_mibset \ + mibattribute=dot11WEPDefaultKey2=$IF_WLAN_NG_KEY2 \ + >/dev/null + $WLANCTL $IFACE dot11req_mibset \ + mibattribute=dot11WEPDefaultKey3=$IF_WLAN_NG_KEY3 \ + >/dev/null + fi +fi + +# MAC startup +if [ "$IF_WIRELESS_MODE" = "ad_hoc" ] || + [ "$IF_WIRELESS_MODE" = "ad-hoc" ]; then + startcmd="$WLANCTL $IFACE dot11req_start " + startcmd="$startcmd ssid=$IF_WIRELESS_ESSID" + startcmd="$startcmd bsstype=independent" + startcmd="$startcmd beaconperiod=$IF_WLAN_NG_BCINT" + startcmd="$startcmd dtimperiod=3" + startcmd="$startcmd cfpollable=false" + startcmd="$startcmd cfpollreq=false" + startcmd="$startcmd cfpperiod=3" + startcmd="$startcmd cfpmaxduration=100" + startcmd="$startcmd probedelay=100" + startcmd="$startcmd dschannel=$IF_WIRELESS_CHANNEL" + j=1 + for i in $IF_WLAN_NG_BASICRATES; do + startcmd="$startcmd basicrate$j=$i" + j=$(expr $j + 1) + done + j=1 + for i in $IF_WLAN_NG_OPRATES; do + startcmd="$startcmd operationalrate$j=$i" + j=$(expr $j + 1) + done + + results=`$startcmd` + if [ $? = 0 ]; then + eval $results + if [ $resultcode != "success" ] ; then + echo "IBSS not started, resultcode=$resultcode" >&2 + exit 1 + fi + else + echo FAILED: $startcmd >&2 + exit 1 + fi +else + # Infrastructure mode. + results=`$WLANCTL $IFACE lnxreq_autojoin \ + "ssid=$IF_WIRELESS_ESSID" \ + authtype=$IF_WLAN_NG_AUTHTYPE | sed 's/\([^=]*\)=\(.*\)/\1="\2"/'` + if [ $? = 0 ]; then + eval $results + if [ ${resultcode:-"failure"} != "success" ]; then + echo 'error: Autojoin indicated failure!' >&2 + exit 1 + fi + fi +fi diff --git a/packages/wlan-ng/files/resume b/packages/wlan-ng/files/resume index e69de29bb2..f875939da6 100644 --- a/packages/wlan-ng/files/resume +++ b/packages/wlan-ng/files/resume @@ -0,0 +1,22 @@ +#!/bin/sh +# This script is run on resume to force a down and up of any linux-wlanng +# iterfaces. Otherwise they could get into a weird state. +IFACES=$(ifconfig | grep -B 1 ^wlan | cut -d ' ' -f 1) +for iface in $IFACES; do + echo down $ifcase >>/tmp/log + ifdown $iface || ifconfig $iface down +done + +rmmod prism2_pci 2>/dev/null +rmmod prism2_usb 2>/dev/null +rmmod prism2_cs 2>/dev/null +rmmod prism2_plx 2>/dev/null +rmmod p80211 2>/dev/null + +# There is a race here for some reason. +sleep 2 + +for iface in $IFACES; do + ifup $iface +done + diff --git a/packages/wlan-ng/files/usbctl b/packages/wlan-ng/files/usbctl index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5a34b03c3983166f9999dca662d39a14811ef4ad 100644 GIT binary patch literal 4040 zcmb`KPiS1%6~@m6G=C}9lN=t)sh+lVx=l{%(M?bdQJv@jlN#@5i$ zJTdbW6r!|ptrQ0WrnXx`NtuCWQGyo-7ckVqu*7DGPmP?iSg>22sj!+p%%ux&{zjQ9F)p)V! z+a3aYKsVS8+C?1sQ9t?7cYO+U0mVq@mI6%eC**U~{O*d`5%fOr9q<8mI}SxK?nD^RUfXYnum@=0Bry5+z$o_N$i9p{jvbHpRqRRZv8erP z*ad6{t^R$$Z{c6Se*bFo`}Z zSlimV|3~mPc{KU#drJLW=J32z4??bcJ?JdSyElWRdu7es z|X#`15W2gAt#^{scb>ztqOx9B%q&p6|u6ceTZ}6!p<}4DcPAC(^%LP{*yYK8bedpZP3)?d+W=m^a0CIE?p;YZ>bgoHX-KpD#y#T-w}d zOtyUA2DvxDS}0faJsT^E-R}J*)Hi|;$*04#r&t>YAM!6BZ0~zNdA1%r7Ws|i?T>85 z+n}%N_fdBMejJa+8;p3Z@i4c27l=o5=hHU{N8?N|&aQ|bkCTXOjdLU#=cA9e?rV&{ zqFr$Y=ek2`0$b)3fw#~f84ry1ik zV|d@lhPLWnAV$d+(yH|qiRCtD)PD>0QBU13dKZM}8(QZbYijQ0<{M(}+s*gG61IZT z{i8R8`aJ?9Tr)O79Gn4m9`u5};L~7|m{cA|>+V)Rz0115$6H(80QG#5r&u=7JF&Or z*uE|%X6ctXW|mCkYaVtvK7xSW}iELYS7PLvg}O0He=bs%N05{wO_UD zrOJHvrDCOHk4eeeb@8|Iz{!aT| zl}?4G3OzA=ezr7C)SE2~Yb}ezf;vf8V66Z_@t@IuCBa;||ys@g&P2=G}&O8{UcHK+{kJA|vOU(No72;`L^xl6T-a<@5$Gjg>7LTyP|K;?5 zoxU@cnD-+pVxI1RF?hJ#mYDZW3vV3W_yc(FweWNvPQV-6_STF~K7R@{$BIwqxBjne zP*xsD#8Di-1d314-Iv+E4X8j=FZmS^U;biV96MFp^YUxTaUa#o-v=s061VBRmakY+ MY?j}~20G^b6Lr~&EC2ui literal 0 HcmV?d00001 diff --git a/packages/wlan-ng/files/wlan-ng.modutils b/packages/wlan-ng/files/wlan-ng.modutils index e69de29bb2..010e20d375 100644 --- a/packages/wlan-ng/files/wlan-ng.modutils +++ b/packages/wlan-ng/files/wlan-ng.modutils @@ -0,0 +1 @@ +alias wlan0 prism2_usb diff --git a/packages/wlan-ng/files/wlan.agent b/packages/wlan-ng/files/wlan.agent index e69de29bb2..945d646984 100644 --- a/packages/wlan-ng/files/wlan.agent +++ b/packages/wlan-ng/files/wlan.agent @@ -0,0 +1,107 @@ +#!/bin/sh +# +# p80211/wlan hotplug policy agent. +# +# wlan hotplug params include: +# +# ACTION=%s [register|remove|shutdown|startup|suspend|resume] +# INTERFACE=%s +# NSDNAME=%s +# + +cd /etc/hotplug +# must have ./ here or busybox shell barfs +. ./hotplug.functions + +#DEBUG=yes export DEBUG + +if [ "$INTERFACE" = "" ]; then + mesg Bad WLAN invocation: \$INTERFACE is not set + exit 1 +fi + +if [ "$NSDNAME" = "" ]; then + mesg Bad WLAN invocation: \$NSDNAME is not set + exit 1 +fi + +debug_mesg WLAN $ACTION on $INTERFACE \($NSDNAME\) + +if [ "$NSDNAME" = "prism2_cs" ] ; then + mesg "WLAN Hotplug bypassed for pcmcia" + exit 0 +fi + +# load up the shared scripts +if [ ! -f /etc/wlan/shared ] ; then + mesg "/etc/wlan/shared not present, aborting" + exit 1 +fi + +ECHO=mesg +. /etc/wlan/shared + +case $ACTION in +'register'|'resume') + eval 'WLAN_ENABLE=$ENABLE_'$INTERFACE + if ! is_true $WLAN_ENABLE ; then + mesg "WLAN $ACTION - interface $INTERFACE not enabled, aborting" + exit 1 + fi + debug_mesg WLAN $INTERFACE registered. + wlan_bring_it_up $INTERFACE + if [ $? = 0 ] ; then + mesg WLAN $INTERFACE brought up successfully. + if [ -x /etc/wlan/network ] ; then + mesg "WLAN bringing up layer 3+ with /etc/wlan/network" + /etc/wlan/network start $INTERFACE + elif [ -x /etc/wlan/pre-ifup ] ; then + # pre-ifup is presumed to call ifup if it + # wants to...it may choose to skip it. + mesg "WLAN bringing up layer 3+ with /etc/wlan/pre-ifup" + /etc/wlan/pre-ifup $INTERFACE + else + mesg "WLAN bringing up layer 3+ with /sbin/ifup" + /sbin/ifup $INTERFACE + fi + else + mesg WLAN Could not bring up $INTERFACE + exit 1 + fi + # eventually invoke net.agent on $INTERFACE w/ REGISTER +;; +'remove'|'suspend') + debug_mesg WLAN $INTERFACE removed. + eval 'WLAN_ENABLE=$ENABLE_'$INTERFACE + if ! is_true $WLAN_ENABLE ; then + mesg "WLAN $ACTION - interface $INTERFACE not enabled, aborting" + exit 1 + fi + if [ -x /etc/wlan/network ] ; then + mesg "WLAN taking down layer 3+ with /etc/wlan/network" + /etc/wlan/network stop $INTERFACE + elif [ -x /etc/wlan/post-ifdown ] ; then + # post-ifdown is presumed to call ifdown if it + # wants to...it may choose to skip it. + mesg "WLAN taking down layer 3+ with /etc/wlan/post-ifdown" + /etc/wlan/post-ifdown $INTERFACE + else + mesg "WLAN taking down layer 3+ with /sbin/ifdown" + /sbin/ifdown $INTERFACE + fi + wlan_disable $INTERFACE +;; +'startup') + # kick off wland. + debug_mesg WLAN p80211 starting! + start_wland +;; +'shutdown') + debug_mesg WLAN p80211 shutting down! + stop_wland +;; +*) + debug_mesg WLAN $ACTION event not supported + exit 1 ;; + +esac diff --git a/packages/wlan-ng/files/Ambit_usb.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/Ambit_usb.patch similarity index 100% rename from packages/wlan-ng/files/Ambit_usb.patch rename to packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/Ambit_usb.patch diff --git a/packages/wlan-ng/files/OZ-Configure.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/OZ-Configure.patch similarity index 100% rename from packages/wlan-ng/files/OZ-Configure.patch rename to packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/OZ-Configure.patch diff --git a/packages/wlan-ng/files/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.in similarity index 100% rename from packages/wlan-ng/files/config.in rename to packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.in diff --git a/packages/wlan-ng/files/config.mk b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.mk similarity index 100% rename from packages/wlan-ng/files/config.mk rename to packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.mk diff --git a/packages/wlan-ng/files/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/no-compat.patch similarity index 100% rename from packages/wlan-ng/files/no-compat.patch rename to packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/no-compat.patch diff --git a/packages/wlan-ng/files/pass-kernel-cross.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/pass-kernel-cross.patch similarity index 100% rename from packages/wlan-ng/files/pass-kernel-cross.patch rename to packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/pass-kernel-cross.patch diff --git a/packages/wlan-ng/files/scripts-makefile-hostcc.diff b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/scripts-makefile-hostcc.diff similarity index 100% rename from packages/wlan-ng/files/scripts-makefile-hostcc.diff rename to packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/scripts-makefile-hostcc.diff diff --git a/packages/wlan-ng/files/version.h b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/version.h similarity index 100% rename from packages/wlan-ng/files/version.h rename to packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/version.h -- 2.39.5