Merge openembedded@openembedded.bkbits.net:packages-devel

into handhelds.org:/home/kergoth/code/packages

2004/11/14 12:55:25-05:00 handhelds.org!kergoth
Include scripts for wlan-ng: debian's apmd resume, debian's interfaces if-pre-up.d, debian's interfaces if-post-down.d

2004/11/14 12:54:49-05:00 handhelds.org!kergoth
Add the steps necessary to bring up wireless on the SL6K to its wlan0 entry in interfaces.

BKrev: 41979c14e-I76hv6xeTgd302NzWzew

7 files changed, 10 insertions, 109 deletions

diff --git a/wlan-ng/files/post-down b/wlan-ng/files/post-down
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/wlan-ng/files/post-down
diff --git a/wlan-ng/files/pre-up b/wlan-ng/files/pre-up
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/wlan-ng/files/pre-up
diff --git a/wlan-ng/files/resume b/wlan-ng/files/resume
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/wlan-ng/files/resume
diff --git a/wlan-ng/files/sl6kwlanctl-ng b/wlan-ng/files/sl6kwlanctl-ng
deleted file mode 100644
index 377b9d4dc9..0000000000
--- a/wlan-ng/files/sl6kwlanctl-ng
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-modprobe usb_ohci_tc6393
-
-if test ! -d /dev/usb
-then
-	mkdir -p /dev/usb
-fi
-if test ! -c /dev/usb/host_ohci
-then
-	printf "*\tCreating /dev/usb/host_ohci node\n"
-	mknod /dev/usb/host_ohci c 10 222
-fi
-
-case $0 in
-wlanup|/sbin/wlanup)
-	printf "*\tStarting up wlan-ng interface\n"
-	modprobe prism2_usb
-	/sbin/usbctl on 1
-	/etc/init.d/wlan start
-	;;
-wlandown|/sbin/wlandown)
-	printf "*\tShutting down wlan-ng interface\n"
-	/etc/init.d/wlan stop
-	/sbin/usbctl off 1
-	rmmod prism2_usb
-	;;
-*)
-	printf "*\tUSAGE: $0\n"
-	;;
-esac
diff --git a/wlan-ng/files/wlanctl-ng b/wlan-ng/files/wlanctl-ng
deleted file mode 100644
index 3bd5b1376c..0000000000
--- a/wlan-ng/files/wlanctl-ng
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-modprobe usb_ohci_tc6393
-
-if test ! -d /dev/usb
-then
-	mkdir -p /dev/usb
-fi
-if test ! -c /dev/usb/host_ohci
-then
-	printf "*\tCreating /dev/usb/host_ohci node\n"
-	mknod /dev/usb/host_ohci c 10 222
-fi
-
-case $0 in
-wlanup)
-	printf "*\tStarting up wlan-ng interface\n"
-	modprobe prism2_usb
-	/sbin/usbctl on 1
-	/etc/init.d/wlan start
-	;;
-wlandown)
-	printf "*\tShutting down wlan-ng interface\n"
-	/etc/init.d/wlan stop
-	/sbin/usbctl off 1
-	rmmod prism2_usb
-	;;
-esac
diff --git a/wlan-ng/wlan-ng-modules_0.2.1pre21.oe b/wlan-ng/wlan-ng-modules_0.2.1pre21.oe
deleted file mode 100644
index 929ebb08ad..0000000000
--- a/wlan-ng/wlan-ng-modules_0.2.1pre21.oe
+++ /dev/null
@@ -1,44 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards"
-DEPENDS = "virtual/kernel"
-MAINTAINER = "Jeremy Grant <jeremy@thegrantclan.org>"
-LICENSE = "GPL"
-PR = "r4"
-
-
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-	file://no-compat.patch;patch=1 \
-	file://Ambit_usb.patch;patch=1 \
-	file://config.mk \
-	file://wlan-ng.modutils \
-	file://wlan.agent \
-	file://version.h \
-	file://sl6kwlanctl-ng \
-	file://usbctl"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
-inherit module
-
-EXTRA_OEMAKE = "all"
-
-do_configure() {
-	install ${WORKDIR}/config.mk ${S}/config.mk
-	install ${WORKDIR}/version.h ${S}/src/include/wlan/
-}
-
-do_install() {
-	oe_runmake install DESTDIR=${D}
-	mkdir -p ${D}/etc/modutils/
-	mkdir -p ${D}/etc/hotplug/
-	mkdir -p ${D}/sbin/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}/etc/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}/etc/hotplug/wlan.agent
-	install -m 0755 ${WORKDIR}/usbctl ${D}/sbin/usbctl
-	install -m 0755 ${WORKDIR}/sl6kwlanctl-ng ${D}/sbin/sl6kwlanctl-ng
-	ln -s /sbin/sl6kwlanctl-ng ${D}/sbin/wlanup
-	ln -s /sbin/sl6kwlanctl-ng ${D}/sbin/wlandown
-}
-
-sbindir = "/sbin"
-PACKAGES_prepend = "wlan-ng-utils "
-FILES_wlan-ng-utils = "${sysconfdir} ${sbindir}"
diff --git a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
index 08cf03367b..a129434d10 100644
--- a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
+++ b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
@@ -4,7 +4,7 @@ DEPENDS = "virtual/kernel"
 RRECOMMENDS = "wlan-ng-utils"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
 	file://no-compat.patch;patch=1 \
@@ -15,8 +15,10 @@ SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz
 	file://wlan-ng.modutils \
 	file://wlan.agent \
 	file://config.in \
-	file://sl6kwlanctl-ng \
-	file://usbctl"
+	file://usbctl \
+	file://resume \
+	file://pre-up \
+	file://post-down"
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
 inherit module
@@ -57,10 +59,12 @@ do_install() {
 	mkdir -p ${D}/sbin/
 	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}/etc/modutils/wlan-ng.conf
 	install -m 0755 ${WORKDIR}/wlan.agent ${D}/etc/hotplug/wlan.agent
+	install -d ${D}/${sysconfdir}/network/if-pre-up.d
+	install -m 0755 ${WORKDIR}/pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wlan-ng
+	install -m 0755 ${WORKDIR}/post-down ${D}/${sysconfdir}/network/if-post-down.d/wlan-ng
+	install -d ${D}/${sysconfdir}/apm/resume.d
+	install -m 0755 ${WORKDIR}/resume ${D}/${sysconfdir}/apm/resume.d/wlan-ng
 	install -m 0755 ${WORKDIR}/usbctl ${D}/sbin/usbctl
-	install -m 0755 ${WORKDIR}/sl6kwlanctl-ng ${D}/sbin/sl6kwlanctl-ng
-	ln -s /sbin/sl6kwlanctl-ng ${D}/sbin/wlanup
-	ln -s /sbin/sl6kwlanctl-ng ${D}/sbin/wlandown
 	install -d ${D}/${mandir}
 	mv ${D}/usr/local/man/* ${D}/${mandir}
 	rm -r ${D}/usr/local/man