diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /hostap | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'hostap')
21 files changed, 0 insertions, 434 deletions
diff --git a/hostap/files/hostap-fw-load.patch b/hostap/files/hostap-fw-load.patch deleted file mode 100644 index 107636290e..0000000000 --- a/hostap/files/hostap-fw-load.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- hostap-utils-0.2.4/hostap_fw_load~hostap-fw-load -+++ hostap-utils-0.2.4/hostap_fw_load -@@ -6,9 +6,9 @@ - # Firmware images for the card - # TODO: could try to select correct firmware type automatically - --PRI=/etc/pcmcia/PM010102.HEX --STA=/etc/pcmcia/RF010802.HEX --PRISM2_SREC=/usr/local/bin/prism2_srec -+PRI=/etc/pcmcia/pm010102.hex -+STA=/etc/pcmcia/rf010803.hex -+PRISM2_SREC=/usr/sbin/prism2_srec - - set -e - diff --git a/hostap/files/hostap_cs.conf b/hostap/files/hostap_cs.conf deleted file mode 100644 index 253423733b..0000000000 --- a/hostap/files/hostap_cs.conf +++ /dev/null @@ -1,154 +0,0 @@ -module "hostap_cs" opts "channel=3 iw_mode=2 essid=any ignore_cis_vcc=1" - -card "3Com AirConnect" - version "3Com", "3CRWE737A AirConnect Wireless LAN PC Card" - bind "hostap_cs" - -card "Actiontec 802CI2" - manfid 0x1668, 0x0101 - bind "hostap_cs" - -card "AirWay 802.11 Adapter (PCMCIA)" - #version "AirWay", "802.11 Adapter (PCMCIA)" - manfid 0x0261, 0x0002 - bind "hostap_cs" - -card "Asus SpaceLink WL110" - manfid 0x02aa,0x0002 - bind "hostap_cs" - -## handhelds.org bug 964 -card "Belkin F5D6060 Ethernet" - #version "PCMCIA", "11M WLAN Card v2.5", "ISL37300P", "RevA" - manfid 0x0274, 0x1612 - bind "hostap_cs" - -card "Compaq 11Mbps Wireless PC Card" - manfid 0x028a, 0x0002 - bind "hostap_cs" - -card "Compaq WL100 11 Mbps Wireless Adapter" - manfid 0x0138, 0x0002 - bind "hostap_cs" - -card "Compaq HNW-100 11 Mbps Wireless Adapter" - manfid 0x028a, 0x0002 - bind "hostap_cs" - -card "D-Link DWL-650" - version "D", "Link DWL-650 11Mbps WLAN Card" - bind "hostap_cs" - -card "D-Link DRC-650" - version "D", "Link DRC-650 11Mbps WLAN Card" - bind "hostap_cs" - -card "D-Link DCF660" - manfid 0xd601, 0x0005 - bind "hostap_cs" - -card "Farallon SkyLINE" - version "INTERSIL", "HFA384x/IEEE" - bind "hostap_cs" - -card "HyperLink Wireless PC Card 11Mbps" - version "HyperLink", "Wireless PC Card 11Mbps" - bind "hostap_cs" - -# card "Intersil PRISM2 11 Mbps Wireless Adapter" -# manfid 0x0156, 0x0002 -# bind "hostap_cs" - -card "Intel PRO/Wireless 2011" - manfid 0x0089, 0x0001 - bind "hostap_cs" - -card "LA4111 Spectrum24 Wireless LAN PC Card" - version "Symbol Technologies" - bind "hostap_cs" - -card "Linksys WPC11 11Mbps 802.11b WLAN Card" - version "Instant Wireless ", " Network PC CARD", "Version 01.02" - bind "hostap_cs" - -card "Linksys WCF11 11Mbps 802.11b WLAN Card" - manfid 0x0274, 0x3301 - bind "hostap_cs" - -## handhelds.org bug #790 -card "Linksys Wireless CompactFlash Card WCF12" - manfid 0x028a, 0x0673 - bind "hostap_cs" - -card "Linksys WLAN CF Card" - manfid 0x0274, 0x3301 - bind "hostap_cs" - -card "MELCO WLI-PCM-L11" - version "MELCO", "WLI-PCM-L11" - bind "hostap_cs" - -card "MELCO WLI-PCM-L11G" - version "MELCO", "WLI-PCM-L11G" - bind "hostap_cs" - -card "MELCO WLI-PCM-L11G" - version "BUFFALO", "WLI-PCM-L11G" - bind "hostap_cs" - -card "NCR WaveLAN/IEEE Adapter" - version "NCR", "WaveLAN/IEEE" - bind "hostap_cs" - -card "Nortel Networks eMobility 802.11 Wireless Adapter" - manfid 0x01eb, 0x080a - bind "hostap_cs" - -card "PLANEX GeoWave GW-CF110" - version "PLANEX", "GeoWave/GW-CF110" - bind "hostap_cs" - -card "PROXIM LAN PC CARD HARMONY 80211B" - version "PROXIM", "LAN PC CARD HARMONY 80211B" - bind "hostap_cs" - -card "Proxim RangeLAN/DS" - version "PROXIM","RangeLAN-DS/LAN PC CARD" - manfid 0x0126, 0x8000 - bind "hostap_cs" - -card "Safeway 802.11b Wireless Adapter" - manfid 0xd601, 0x0002 - bind "hostap_cs" - -card "SAMSUNG 11Mbps WLAN Card" - version "SAMSUNG", "11Mbps WLAN Card" - bind "hostap_cs" - -# needs firmware upload via hostap_fw_load -card "SanDisk ConnectPlus OEM (0MB)" - manfid 0xd601, 0x0010 - bind "hostap_cs" - -card "Senao/Origo 80211b WLAN Card" - manfid 0x000b,0x7100 - bind "hostap_cs" - -card "Sitecom WL-007 WLAN CF Card" - manfid 0xd601, 0x0004 - bind "hostap_cs" - -card "SMC2632 802.11 (prism2) Card" - version "SMC", "SMC2632W", "Version 01.02", "" - bind "hostap_cs" - -card "SpeedStream SS1021 Wireless Adapter" - #version "Siemens", "SpeedStream Wireless PCMCIA" - manfid 0x02ac, 0x0002 - bind "hostap_cs" - -card "ZCOMAX AirRunner/XI-300" - #version "ZCOMAX", "AirRunner/XI-300" - manfid 0xd601, 0x0002 - bind "hostap_cs" - diff --git a/hostap/files/hostap_cs.modconf b/hostap/files/hostap_cs.modconf deleted file mode 100644 index 275b22246d..0000000000 --- a/hostap/files/hostap_cs.modconf +++ /dev/null @@ -1,2 +0,0 @@ -options hostap_cs ignore_cis_vcc=1 - diff --git a/hostap/files/wpa_supplicant_default.conf b/hostap/files/wpa_supplicant_default.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/files/wpa_supplicant_default.conf +++ /dev/null diff --git a/hostap/hostap-daemon_0.2.4.bb b/hostap/hostap-daemon_0.2.4.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-daemon_0.2.4.bb +++ /dev/null diff --git a/hostap/hostap-modules-0.2.4/Makefile.patch b/hostap/hostap-modules-0.2.4/Makefile.patch deleted file mode 100644 index 2fc5e9ed4b..0000000000 --- a/hostap/hostap-modules-0.2.4/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/hostap/hostap-modules-0.2.4/mtx_compat.diff b/hostap/hostap-modules-0.2.4/mtx_compat.diff deleted file mode 100644 index c2d6662d69..0000000000 --- a/hostap/hostap-modules-0.2.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/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff b/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff deleted file mode 100644 index 2f7642ff08..0000000000 --- a/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff +++ /dev/null @@ -1,81 +0,0 @@ ---- driver/modules/hostap_pci.c.orig 2004-02-09 20:54:07.000000000 +0100 -+++ driver/modules/hostap_pci.c 2004-08-09 17:18:49.591216712 +0200 -@@ -49,6 +49,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) -@@ -277,6 +284,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); -@@ -292,7 +303,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: -@@ -390,17 +401,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 (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; - } - diff --git a/hostap/hostap-modules-0.2.5/Makefile.patch b/hostap/hostap-modules-0.2.5/Makefile.patch deleted file mode 100644 index 2fc5e9ed4b..0000000000 --- a/hostap/hostap-modules-0.2.5/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/hostap/hostap-modules-0.2.5/mtx_compat.diff b/hostap/hostap-modules-0.2.5/mtx_compat.diff deleted file mode 100644 index c2d6662d69..0000000000 --- a/hostap/hostap-modules-0.2.5/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/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff b/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff deleted file mode 100644 index 2f7642ff08..0000000000 --- a/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff +++ /dev/null @@ -1,81 +0,0 @@ ---- driver/modules/hostap_pci.c.orig 2004-02-09 20:54:07.000000000 +0100 -+++ driver/modules/hostap_pci.c 2004-08-09 17:18:49.591216712 +0200 -@@ -49,6 +49,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) -@@ -277,6 +284,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); -@@ -292,7 +303,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: -@@ -390,17 +401,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 (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; - } - diff --git a/hostap/hostap-modules_0.1.3.bb b/hostap/hostap-modules_0.1.3.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-modules_0.1.3.bb +++ /dev/null diff --git a/hostap/hostap-modules_0.2.0.bb b/hostap/hostap-modules_0.2.0.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-modules_0.2.0.bb +++ /dev/null diff --git a/hostap/hostap-modules_0.2.4.bb b/hostap/hostap-modules_0.2.4.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-modules_0.2.4.bb +++ /dev/null diff --git a/hostap/hostap-modules_0.2.5.bb b/hostap/hostap-modules_0.2.5.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-modules_0.2.5.bb +++ /dev/null diff --git a/hostap/hostap-utils_0.2.4.bb b/hostap/hostap-utils_0.2.4.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-utils_0.2.4.bb +++ /dev/null diff --git a/hostap/hostap-wpa-supplicant-nossl/wpa-defconfig b/hostap/hostap-wpa-supplicant-nossl/wpa-defconfig deleted file mode 100644 index bf5d5e28e7..0000000000 --- a/hostap/hostap-wpa-supplicant-nossl/wpa-defconfig +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_DRIVER_WEXT=y -CONFIG_WIRELESS_EXTENSION=y -CONFIG_DRIVER_HOSTAP=y - diff --git a/hostap/hostap-wpa-supplicant-nossl_0.2.5.bb b/hostap/hostap-wpa-supplicant-nossl_0.2.5.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-wpa-supplicant-nossl_0.2.5.bb +++ /dev/null diff --git a/hostap/hostap-wpa-supplicant-ssl/wpa-defconfig b/hostap/hostap-wpa-supplicant-ssl/wpa-defconfig deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-wpa-supplicant-ssl/wpa-defconfig +++ /dev/null diff --git a/hostap/hostap-wpa-supplicant-ssl_0.2.5.bb b/hostap/hostap-wpa-supplicant-ssl_0.2.5.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/hostap/hostap-wpa-supplicant-ssl_0.2.5.bb +++ /dev/null diff --git a/hostap/hostap-wpa-supplicant_0.2.5.inc b/hostap/hostap-wpa-supplicant_0.2.5.inc deleted file mode 100644 index 1aac31b523..0000000000 --- a/hostap/hostap-wpa-supplicant_0.2.5.inc +++ /dev/null @@ -1,30 +0,0 @@ -SECTION = "kernel/userland" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://wpa-defconfig \ - file://wpa_supplicant_default.conf" - -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_compile() { - unset CFLAGS - base_do_compile -} - -do_configure() { - install -m 0644 ${WORKDIR}/wpa-defconfig .config -} - -do_install() { - install -d ${D}/${sysconfdir} ${D}/${bindir} - install -m 0644 wpa_supplicant.conf ${D}/${sysconfdir}/wpa_supplicant.conf.sample - install -m 0644 ../wpa_supplicant_default.conf ${D}/${sysconfdir}/wpa_supplicant.conf - install -m 0755 wpa_passphrase ${D}/${bindir} - install -m 0755 wpa_cli ${D}/${bindir} - install -m 0755 wpa_supplicant ${D}/${bindir} -} - |