wlan-ng: add modules and userland utilities 0.2.2 (final)

10 files changed, 316 insertions, 0 deletions

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch
new file mode 100644
index 0000000000..a8182076d7
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch
@@ -0,0 +1,43 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c~compile-fix-HACK.patch
++++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c
+@@ -21,15 +21,6 @@
+ 						 * is set to and what the CIS
+ 						 * says.
+ 						 */
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
+-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,5))
+-static int numlist = 4;
+-module_param_array(irq_list, int, numlist, 0444);
+-#else
+-module_param_array(irq_list, int, NULL, 0444);
+-#endif
+-module_param( irq_mask, int, 0644);
+-#endif
+ 
+ static dev_link_t	*dev_list = NULL;	/* head of instance list */
+ 
+--- linux-wlan-ng-0.2.2/src/prism2/driver/hfa384x_usb.c~compile-fix-HACK.patch
++++ linux-wlan-ng-0.2.2/src/prism2/driver/hfa384x_usb.c
+@@ -3240,7 +3240,7 @@
+ 	int		result;
+ 	DBFENTER;
+ 
+-	might_sleep();
++	might_sleep(0);
+ 
+ 	if (usb_clear_halt(hw->usb, hw->endp_in)) {
+ 		WLAN_LOG_ERROR(
+@@ -3316,7 +3316,7 @@
+ 	int	i;
+ 	DBFENTER;
+ 
+-	might_sleep();
++	might_sleep(0);
+ 
+ 	/* There's no need for spinlocks here. The USB "disconnect"
+ 	 * function sets this "removed" flag and then calls us.
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
new file mode 100644
index 0000000000..5b9b7c780c
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
@@ -0,0 +1,21 @@
+WLAN_VERSION=0
+WLAN_PATCHLEVEL=2
+WLAN_SUBLEVEL=1
+WLAN_EXTRAVERSION=-pre26
+#LINUX_SRC=$(KERNEL_SOURCE)
+PCMCIA_SRC=
+PREFIX=
+INST_EXEDIR=/sbin
+#TARGET_ROOT_ON_HOST=
+#RC_DIR=/etc/init.d
+PCMCIA_DIR=/etc/pcmcia
+SYSV_INIT=y
+INSTALL_DEPMOD=
+WLAN_DEBUG=n
+CROSS_COMPILE_ENABLED=n
+CROSS_COMPILE=
+HOST_COMPILE=
+PRISM2_PLX=y
+PRISM2_PCMCIA=y
+PRISM2_PCI=y
+PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch
new file mode 100644
index 0000000000..4f59f0fa5d
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch
@@ -0,0 +1,47 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h~no-compat
++++ linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h
+@@ -351,14 +351,14 @@
+ 
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
+ #ifdef _LINUX_LIST_H
+-
++/*
+ static inline void list_move_tail(struct list_head *list,
+           struct list_head *head)
+ {
+         __list_del(list->prev, list->next);
+         list_add_tail(list, head);
+ }
+-
++*/
+ static inline void __list_splice(struct list_head *list,
+                                 struct list_head *head)
+ {
+@@ -372,13 +372,13 @@
+       last->next = at;
+       at->prev = last;
+ }
+-
++/*
+ static inline void list_move(struct list_head *list, struct list_head *head)
+ {
+       __list_del(list->prev, list->next);
+       list_add(list, head);
+ }
+-
++*/
+ static inline void list_splice_init(struct list_head *list,
+             struct list_head *head)
+ {
+@@ -388,7 +388,6 @@
+        }
+ }
+ 
+-
+ #endif  // LIST_H
+ #endif
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch
new file mode 100644
index 0000000000..a119460a1d
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch
@@ -0,0 +1,31 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch
++++ linux-wlan-ng-0.2.1-pre26/src/Makefile
+@@ -44,10 +44,8 @@
+ 
+ include ../config.mk
+ 
+-DIRS=p80211 prism2 shared wlanctl wland nwepgen \
+-	mkmeta wlancfg
+-ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
+-	nwepgen wlancfg
++DIRS=p80211 prism2 shared mkmeta
++ALL_DIRS=mkmeta p80211 prism2 shared
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
+--- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch
++++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile
+@@ -44,7 +44,7 @@
+ 
+ include ../../config.mk
+ 
+-DIRS=driver ridlist download
++DIRS=driver ridlist
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
new file mode 100644
index 0000000000..ccbf310b3f
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards"
+HOMEPAGE = "http://www.linux-wlan.org"
+SECTION = "kernel/modules"
+DEPENDS = "virtual/kernel"
+RRECOMMENDS = "wlan-ng-utils"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+	file://no-compat.patch;patch=1 \
+	file://only-the-modules.patch;patch=1 \
+        file://compile-fix-HACK.patch;patch=1 \
+	file://config.in"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+inherit module
+
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = "CC="${KERNEL_CC}" LD=${KERNEL_LD} PARALLEL_MAKE=''"
+
+do_configure() {
+	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
+	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
+
+        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+                echo "PRISM2_PCMCIA=y"          >> config.mk
+                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
+        fi
+        echo "TARGET_ROOT_ON_HOST=${D}/"         >> config.mk
+        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
+	echo "CC=${KERNEL_CC}"			>> config.mk
+	echo "LD=${KERNEL_LD}"			>> config.mk
+
+	# Listen closely... sssshhh... can you hear the wlan-ng build system suck?
+	rm -f ${KERNEL_SOURCE}/../config.mk
+	rm -f ${KERNEL_SOURCE}/../../config.mk
+	ln -sf ${S}/config.mk	${KERNEL_SOURCE}/..
+	ln -sf ${S}/config.mk	${KERNEL_SOURCE}/../..
+	install -m 0655 config.mk src/prism2/config.mk
+	install -d src/prism2/driver/include
+	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
+	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
+}
+
+do_compile() {
+	oe_runmake -C src all
+}
+
+do_install() {
+	oe_runmake install DESTDIR=${D}
+
+        # Listen closely... sssshhh... can you hear the wlan-ng build system suck?
+        rm -f ${KERNEL_SOURCE}/../config.mk
+        rm -f ${KERNEL_SOURCE}/../../config.mk	
+}
+
+FILES_${PN} = "/lib"
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
new file mode 100644
index 0000000000..5b9b7c780c
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
@@ -0,0 +1,21 @@
+WLAN_VERSION=0
+WLAN_PATCHLEVEL=2
+WLAN_SUBLEVEL=1
+WLAN_EXTRAVERSION=-pre26
+#LINUX_SRC=$(KERNEL_SOURCE)
+PCMCIA_SRC=
+PREFIX=
+INST_EXEDIR=/sbin
+#TARGET_ROOT_ON_HOST=
+#RC_DIR=/etc/init.d
+PCMCIA_DIR=/etc/pcmcia
+SYSV_INIT=y
+INSTALL_DEPMOD=
+WLAN_DEBUG=n
+CROSS_COMPILE_ENABLED=n
+CROSS_COMPILE=
+HOST_COMPILE=
+PRISM2_PLX=y
+PRISM2_PCMCIA=y
+PRISM2_PCI=y
+PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch
new file mode 100644
index 0000000000..2a4369b931
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch
@@ -0,0 +1,30 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/src/Makefile~only-the-utils
++++ linux-wlan-ng-0.2.2/src/Makefile
+@@ -44,9 +44,9 @@
+ 
+ -include ../config.mk
+ 
+-DIRS=p80211 prism2 shared wlanctl wland nwepgen \
++DIRS=prism2 shared wlanctl wland nwepgen \
+ 	mkmeta wlancfg
+-ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
++ALL_DIRS=mkmeta prism2 shared wlanctl wland \
+ 	nwepgen wlancfg
+ 
+ ifneq ($(wildcard *.addon),) 
+--- linux-wlan-ng-0.2.2/src/prism2/Makefile~only-the-utils
++++ linux-wlan-ng-0.2.2/src/prism2/Makefile
+@@ -44,7 +44,7 @@
+ 
+ -include ../../config.mk
+ 
+-DIRS=driver ridlist download
++DIRS=ridlist download
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb b/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
new file mode 100644
index 0000000000..7d5ceda29c
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
@@ -0,0 +1,66 @@
+DESCRIPTION = "linux-wlan-ng userland utilities"
+HOMEPAGE = "http://www.linux-wlan.org"
+SECTION = "kernel/userland"
+DEPENDS = "virtual/kernel"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+	file://only-the-utils.patch;patch=1 \
+	file://wlan-ng.modutils \
+	file://wlan.agent \
+	file://usbctl \
+	file://resume \
+	file://pre-up \
+	file://post-down \
+	file://config.in"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+# yeah, it's kind of backwards, but otherwise the config step will fail
+inherit module
+
+do_configure() {
+	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
+	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
+
+        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+                echo "PRISM2_PCMCIA=y"          >> config.mk
+                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
+        fi
+        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
+	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
+        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
+	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
+        echo "RC_DIR=${sysconfdir}/"             >> config.mk
+	echo "CC=${CC}"			>> config.mk
+	echo "LD=${LD}"			>> config.mk
+
+	# Shut up, you broken buildsystem
+	install -m 0655 config.mk src/prism2/config.mk
+	install -d src/prism2/driver/include
+	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
+	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
+}
+
+do_compile() {
+	oe_runmake all
+}
+
+do_install() {
+	oe_runmake install
+	mkdir -p ${D}${sysconfdir}/modutils/
+	mkdir -p ${D}${sysconfdir}/hotplug/
+	mkdir -p ${D}${base_sbindir}/
+	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
+	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/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 -d ${D}${sysconfdir}/network/if-post-down.d
+	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}${base_sbindir}/usbctl
+	install -d ${D}${mandir}
+}
+
+FILES_${PN} = "/etc /sbin"