diff options
Diffstat (limited to 'packages')
24 files changed, 53 insertions, 472 deletions
diff --git a/packages/hostap/hostap-modules-0.3.9/.mtn2git_empty b/packages/hostap/hostap-modules-0.3.9/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/hostap/hostap-modules-0.3.9/.mtn2git_empty +++ /dev/null diff --git a/packages/hostap/hostap-modules-0.3.9/Makefile.patch b/packages/hostap/hostap-modules-0.3.9/Makefile.patch deleted file mode 100644 index 2fc5e9ed4b..0000000000 --- a/packages/hostap/hostap-modules-0.3.9/Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hostap-driver-0.2.4/Makefile.old 2004-07-31 10:35:50.000000000 +0100 -+++ hostap-driver-0.2.4/Makefile 2004-07-31 10:35:56.000000000 +0100 -@@ -51,7 +51,7 @@ - - VERFILE := $(KERNEL_PATH)/include/linux/version.h - KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \ -- then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \ -+ then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \ - else uname -r; fi) - KERNELVER := $(shell echo "$(KERNELRELEASE)" | \ - sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/") diff --git a/packages/hostap/hostap-modules-0.3.9/add_event.patch b/packages/hostap/hostap-modules-0.3.9/add_event.patch deleted file mode 100644 index d5f2a10e86..0000000000 --- a/packages/hostap/hostap-modules-0.3.9/add_event.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: hostap-driver-0.3.7/driver/modules/hostap_cs.c -=================================================================== ---- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-08-03 17:05:53.000000000 +0100 -+++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-08-03 17:07:59.000000000 +0100 -@@ -526,11 +526,13 @@ - dev_list = link; - client_reg.dev_info = &dev_info; - client_reg.Attributes = INFO_IO_CLIENT; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) - client_reg.EventMask = CS_EVENT_CARD_INSERTION | - CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &prism2_event; -+#endif - client_reg.Version = 0x0210; - client_reg.event_callback_args.client_data = link; - ret = pcmcia_register_client(&link->handle, &client_reg); -@@ -913,6 +915,9 @@ - .name = "hostap_cs", - }, - .attach = prism2_attach, -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) -+ .event = prism2_event, -+#endif - .detach = prism2_detach, - .owner = THIS_MODULE, - }; diff --git a/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch b/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch deleted file mode 100644 index c29cc8d2c9..0000000000 --- a/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap.c hostap-driver-0.3.7/driver/modules/hostap.c ---- hostap-driver-0.3.7.orig/driver/modules/hostap.c 2005-07-25 09:14:01.995965088 +0000 -+++ hostap-driver-0.3.7/driver/modules/hostap.c 2005-07-25 09:13:22.301999488 +0000 -@@ -25,6 +25,7 @@ - #include <linux/if_arp.h> - #include <linux/delay.h> - #include <linux/random.h> -+#include <linux/utsname.h> - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) - #include <linux/tqueue.h> - #else -diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c ---- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:14:01.996964936 +0000 -+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:13:22.302999336 +0000 -@@ -19,6 +19,7 @@ - #include <linux/netdevice.h> - #include <linux/if_ether.h> - #include <linux/if_arp.h> -+#include <linux/utsname.h> - #include <asm/string.h> - - #include "hostap_crypt.h" -diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c ---- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:14:01.996964936 +0000 -+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:13:22.302999336 +0000 -@@ -19,6 +19,7 @@ - #include <linux/netdevice.h> - #include <linux/if_ether.h> - #include <linux/if_arp.h> -+#include <linux/utsname.h> - #include <asm/string.h> - - #include "hostap_crypt.h" -diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c ---- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c 2005-07-25 09:14:01.996964936 +0000 -+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c 2005-07-25 09:13:22.302999336 +0000 -@@ -15,6 +15,7 @@ - #include <linux/init.h> - #include <linux/slab.h> - #include <linux/random.h> -+#include <linux/utsname.h> - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) - #include <linux/tqueue.h> - #else -diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c hostap-driver-0.3.7/driver/modules/hostap_cs.c ---- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-07-25 09:14:01.997964784 +0000 -+++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-07-25 09:13:22.302999336 +0000 -@@ -12,6 +12,7 @@ - #include <linux/timer.h> - #include <linux/skbuff.h> - #include <linux/netdevice.h> -+#include <linux/utsname.h> - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) - #include <linux/tqueue.h> - #else -diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c hostap-driver-0.3.7/driver/modules/hostap_pci.c ---- hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c 2005-07-25 09:14:01.997964784 +0000 -+++ hostap-driver-0.3.7/driver/modules/hostap_pci.c 2005-07-25 09:13:22.303999184 +0000 -@@ -11,6 +11,7 @@ - #include <linux/if.h> - #include <linux/skbuff.h> - #include <linux/netdevice.h> -+#include <linux/utsname.h> - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) - #include <linux/tqueue.h> - #else -diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c hostap-driver-0.3.7/driver/modules/hostap_plx.c ---- hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c 2005-07-25 09:14:01.997964784 +0000 -+++ hostap-driver-0.3.7/driver/modules/hostap_plx.c 2005-07-25 09:13:22.303999184 +0000 -@@ -14,6 +14,7 @@ - #include <linux/if.h> - #include <linux/skbuff.h> - #include <linux/netdevice.h> -+#include <linux/utsname.h> - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) - #include <linux/tqueue.h> - #else diff --git a/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch b/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch deleted file mode 100644 index b139ef38f1..0000000000 --- a/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old 2005-04-17 09:12:38.304421464 +0100 -+++ hostap-driver-0.3.7/driver/modules/hostap_compat.h 2005-04-17 09:13:04.413452288 +0100 -@@ -5,7 +5,7 @@ - #define NEW_MODULE_CODE - #endif - --#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD) - - #define HOSTAP_QUEUE struct tq_struct - diff --git a/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff b/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff deleted file mode 100644 index c2d6662d69..0000000000 --- a/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- driver/modules/hostap_compat.h.orig 2004-08-09 16:16:48.359929856 +0200 -+++ driver/modules/hostap_compat.h 2004-08-09 16:17:12.383277752 +0200 -@@ -13,7 +13,7 @@ - MOD_INC_USE_COUNT; \ - if (schedule_task((q)) == 0) \ - MOD_DEC_USE_COUNT; -- -+/* - static inline void flush_scheduled_work(void) - { - flush_scheduled_tasks(); -@@ -27,7 +27,7 @@ - tq->routine = routine; - tq->data = data; - } -- -+*/ - #else /* kernel < 2.5.44 */ - - #define HOSTAP_QUEUE struct work_struct diff --git a/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff deleted file mode 100644 index e979b72d93..0000000000 --- a/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff +++ /dev/null @@ -1,81 +0,0 @@ ---- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100 -+++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100 -@@ -50,6 +50,13 @@ - }; - - -+#define DEFERRED_IRQ_INITIALIZATION -+ -+#ifdef DEFERRED_IRQ_INITIALIZATION -+struct net_device *devb[MAX_PARM_DEVICES]; -+#endif -+ -+ - #ifdef PRISM2_IO_DEBUG - - static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v) -@@ -280,6 +287,10 @@ - - pci_set_drvdata(pdev, dev); - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+ printk("%s: deferred initialization of IRQs\n", dev_info); -+ devb[cards_found-1] = dev; -+#else - if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name, - dev)) { - printk(KERN_WARNING "%s: request_irq failed\n", dev->name); -@@ -295,7 +306,7 @@ - - printk(KERN_INFO "%s: Intersil Prism2.5 PCI: " - "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq); -- -+#endif - return hostap_hw_ready(dev); - - fail: -@@ -399,18 +410,43 @@ - }; - - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+static void deferred_init(int num_devices) -+{ -+ int n; -+ for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++) -+ { -+ if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name, -+ devb[n])) { -+ printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name); -+ } -+ if (prism2_hw_config(devb[n], 1)) { -+ printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name) -+; -+ } -+ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]-> -+irq); -+ } -+} -+#endif -+ - static int __init init_prism2_pci(void) - { - printk(KERN_INFO "%s: %s\n", dev_info, version); - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) -- if (pci_register_driver(&prism2_pci_drv_id) <= 0) { -+ int n; -+ if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) { - printk("hostap_pci: No devices found, driver not " - "installed.\n"); - pci_unregister_driver(&prism2_pci_drv_id); - return -ENODEV; - } - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+ deferred_init(n); -+#endif -+ - return 0; - #else - return pci_register_driver(&prism2_pci_drv_id); diff --git a/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty b/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty +++ /dev/null diff --git a/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch deleted file mode 100644 index b139ef38f1..0000000000 --- a/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old 2005-04-17 09:12:38.304421464 +0100 -+++ hostap-driver-0.3.7/driver/modules/hostap_compat.h 2005-04-17 09:13:04.413452288 +0100 -@@ -5,7 +5,7 @@ - #define NEW_MODULE_CODE - #endif - --#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD) - - #define HOSTAP_QUEUE struct tq_struct - diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff deleted file mode 100644 index c2d6662d69..0000000000 --- a/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- driver/modules/hostap_compat.h.orig 2004-08-09 16:16:48.359929856 +0200 -+++ driver/modules/hostap_compat.h 2004-08-09 16:17:12.383277752 +0200 -@@ -13,7 +13,7 @@ - MOD_INC_USE_COUNT; \ - if (schedule_task((q)) == 0) \ - MOD_DEC_USE_COUNT; -- -+/* - static inline void flush_scheduled_work(void) - { - flush_scheduled_tasks(); -@@ -27,7 +27,7 @@ - tq->routine = routine; - tq->data = data; - } -- -+*/ - #else /* kernel < 2.5.44 */ - - #define HOSTAP_QUEUE struct work_struct diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff deleted file mode 100644 index e979b72d93..0000000000 --- a/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff +++ /dev/null @@ -1,81 +0,0 @@ ---- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100 -+++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100 -@@ -50,6 +50,13 @@ - }; - - -+#define DEFERRED_IRQ_INITIALIZATION -+ -+#ifdef DEFERRED_IRQ_INITIALIZATION -+struct net_device *devb[MAX_PARM_DEVICES]; -+#endif -+ -+ - #ifdef PRISM2_IO_DEBUG - - static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v) -@@ -280,6 +287,10 @@ - - pci_set_drvdata(pdev, dev); - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+ printk("%s: deferred initialization of IRQs\n", dev_info); -+ devb[cards_found-1] = dev; -+#else - if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name, - dev)) { - printk(KERN_WARNING "%s: request_irq failed\n", dev->name); -@@ -295,7 +306,7 @@ - - printk(KERN_INFO "%s: Intersil Prism2.5 PCI: " - "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq); -- -+#endif - return hostap_hw_ready(dev); - - fail: -@@ -399,18 +410,43 @@ - }; - - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+static void deferred_init(int num_devices) -+{ -+ int n; -+ for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++) -+ { -+ if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name, -+ devb[n])) { -+ printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name); -+ } -+ if (prism2_hw_config(devb[n], 1)) { -+ printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name) -+; -+ } -+ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]-> -+irq); -+ } -+} -+#endif -+ - static int __init init_prism2_pci(void) - { - printk(KERN_INFO "%s: %s\n", dev_info, version); - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) -- if (pci_register_driver(&prism2_pci_drv_id) <= 0) { -+ int n; -+ if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) { - printk("hostap_pci: No devices found, driver not " - "installed.\n"); - pci_unregister_driver(&prism2_pci_drv_id); - return -ENODEV; - } - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+ deferred_init(n); -+#endif -+ - return 0; - #else - return pci_register_driver(&prism2_pci_drv_id); diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc new file mode 100644 index 0000000000..838924a75b --- /dev/null +++ b/packages/hostap/hostap-modules.inc @@ -0,0 +1,42 @@ +DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" +SECTION = "kernel/modules" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" + +SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ + file://hostap_cs.conf" +SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ + file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" +SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " + +S = "${WORKDIR}/hostap-driver-${PV}" + +inherit module + +# Hack Alert :D +ARCH_mipsel = "mips" +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" + +NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ + ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ + ${D}${sysconfdir}/pcmcia + for i in ${NET_MODULES} + do + install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ + done + install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ + install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf + cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf +} + +PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" +FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" +FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" +FILES_hostap-modules = "/lib/modules/" +RDEPENDS_hostap-modules-cs = "hostap-modules" +RDEPENDS_hostap-modules-pci = "hostap-modules" +RPROVIDES_hostap-modules-cs = "hostap-conf" diff --git a/packages/hostap/hostap-modules-0.3.7/.mtn2git_empty b/packages/hostap/hostap-modules/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/hostap/hostap-modules-0.3.7/.mtn2git_empty +++ b/packages/hostap/hostap-modules/.mtn2git_empty diff --git a/packages/hostap/hostap-modules-0.3.7/Makefile.patch b/packages/hostap/hostap-modules/Makefile.patch index 2fc5e9ed4b..2fc5e9ed4b 100644 --- a/packages/hostap/hostap-modules-0.3.7/Makefile.patch +++ b/packages/hostap/hostap-modules/Makefile.patch diff --git a/packages/hostap/hostap-modules-0.3.7/add_event.patch b/packages/hostap/hostap-modules/add_event.patch index d5f2a10e86..d5f2a10e86 100644 --- a/packages/hostap/hostap-modules-0.3.7/add_event.patch +++ b/packages/hostap/hostap-modules/add_event.patch diff --git a/packages/hostap/hostap-modules-0.3.7/hostap-utsname.patch b/packages/hostap/hostap-modules/hostap-utsname.patch index c29cc8d2c9..c29cc8d2c9 100644 --- a/packages/hostap/hostap-modules-0.3.7/hostap-utsname.patch +++ b/packages/hostap/hostap-modules/hostap-utsname.patch diff --git a/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch b/packages/hostap/hostap-modules/hostap_cardid.patch index 05f716e22f..05f716e22f 100644 --- a/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch +++ b/packages/hostap/hostap-modules/hostap_cardid.patch diff --git a/packages/hostap/hostap-modules-0.3.7/ipaq_compat.patch b/packages/hostap/hostap-modules/ipaq_compat.patch index b139ef38f1..b139ef38f1 100644 --- a/packages/hostap/hostap-modules-0.3.7/ipaq_compat.patch +++ b/packages/hostap/hostap-modules/ipaq_compat.patch diff --git a/packages/hostap/hostap-modules-0.4.4/kernel_updates.patch b/packages/hostap/hostap-modules/kernel_updates.patch index 70487a96f8..70487a96f8 100644 --- a/packages/hostap/hostap-modules-0.4.4/kernel_updates.patch +++ b/packages/hostap/hostap-modules/kernel_updates.patch diff --git a/packages/hostap/hostap-modules-0.3.7/mtx_compat.diff b/packages/hostap/hostap-modules/mtx_compat.diff index c2d6662d69..c2d6662d69 100644 --- a/packages/hostap/hostap-modules-0.3.7/mtx_compat.diff +++ b/packages/hostap/hostap-modules/mtx_compat.diff diff --git a/packages/hostap/hostap-modules-0.3.7/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules/mtx_hostap_deferred_irq.diff index e979b72d93..e979b72d93 100644 --- a/packages/hostap/hostap-modules-0.3.7/mtx_hostap_deferred_irq.diff +++ b/packages/hostap/hostap-modules/mtx_hostap_deferred_irq.diff diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb index 0beb792c0d..aead35d25b 100644 --- a/packages/hostap/hostap-modules_0.3.7.bb +++ b/packages/hostap/hostap-modules_0.3.7.bb @@ -1,47 +1,7 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" -SECTION = "kernel/modules" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL" +include hostap-modules.inc PROVIDES = "virtual/kernel-hostap hostap-conf" PR = "r6" -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://hostap_cs.conf \ - file://Makefile.patch;patch=1 \ - file://add_event.patch;patch=1 \ - file://hostap-utsname.patch;patch=1" -SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ - file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" -SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " - -S = "${WORKDIR}/hostap-driver-${PV}" - -inherit module - -# Hack Alert :D -ARCH_mipsel = "mips" -MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" - -NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia - for i in ${NET_MODULES} - do - install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - done - install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf -} - -PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" -FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" -FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" -FILES_hostap-modules = "/lib/modules/" -RDEPENDS_hostap-modules-cs = "hostap-modules" -RDEPENDS_hostap-modules-pci = "hostap-modules" -RPROVIDES_hostap-modules-cs = "hostap-conf" +SRC_URI += "file://Makefile.patch;patch=1 \ + file://add_event.patch;patch=1 \ + file://hostap-utsname.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb index 940b23863b..95bcbff5a6 100644 --- a/packages/hostap/hostap-modules_0.3.9.bb +++ b/packages/hostap/hostap-modules_0.3.9.bb @@ -1,48 +1,8 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" -SECTION = "kernel/modules" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL" +include hostap-modules.inc PROVIDES = "virtual/kernel-hostap hostap-conf" PR = "r8" -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://hostap_cs.conf \ - file://Makefile.patch;patch=1 \ - file://add_event.patch;patch=1 \ - file://hostap-utsname.patch;patch=1 \ - file://hostap_cardid.patch;patch=1" -SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ - file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" -SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " - -S = "${WORKDIR}/hostap-driver-${PV}" - -inherit module - -# Hack Alert :D -ARCH_mipsel = "mips" -MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" - -NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia - for i in ${NET_MODULES} - do - install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - done - install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf -} - -PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" -FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" -FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" -FILES_hostap-modules = "/lib/modules/" -RDEPENDS_hostap-modules-cs = "hostap-modules" -RDEPENDS_hostap-modules-pci = "hostap-modules" -RPROVIDES_hostap-modules-cs = "hostap-conf" +SRC_URI += "file://Makefile.patch;patch=1 \ + file://add_event.patch;patch=1 \ + file://hostap-utsname.patch;patch=1 \ + file://hostap_cardid.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb index 32d282446c..278b2ed0bc 100644 --- a/packages/hostap/hostap-modules_0.4.4.bb +++ b/packages/hostap/hostap-modules_0.4.4.bb @@ -1,46 +1,5 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" -SECTION = "kernel/modules" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL" +include hostap-modules.inc PROVIDES = "virtual/kernel-hostap hostap-conf" PR = "r4" -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://kernel_updates.patch;patch=1 \ - file://hostap_cs.conf " - -SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ - file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" -SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " - -S = "${WORKDIR}/hostap-driver-${PV}" - -inherit module - -# Hack Alert :D -ARCH_mipsel = "mips" -MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" - -NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia - for i in ${NET_MODULES} - do - install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - done - install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf -} - -PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" -FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" -FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" -FILES_hostap-modules = "/lib/modules/" -RDEPENDS_hostap-modules-cs = "hostap-modules" -RDEPENDS_hostap-modules-pci = "hostap-modules" -RPROVIDES_hostap-modules-cs = "hostap-conf" +SRC_URI += "file://kernel_updates.patch;patch=1" |