diff options
11 files changed, 3 insertions, 399 deletions
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/Ambit_usb.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/Ambit_usb.patch deleted file mode 100644 index 7dcc09a882..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/Ambit_usb.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- linux-wlan-ng-0.2.1pre21/src/prism2/driver/prism2_usb.c 2004-03-25 10:03:26.000000000 -0600 -+++ linux-wlan-ng-0.2.1pre21/src/prism2/driver/prism2_usb.c~Ambit_usb 2004-09-16 14:26:54.746340840 -0500 -@@ -34,9 +34,9 @@ - {PRISM_USB_DEVICE(0x0b3b, 0x1602, "ZyXEL ZyAIR B200 Wireless USB Adapter")}, - {PRISM_USB_DEVICE(0x0baf, 0x00eb, "USRobotics USR1120 Wireless USB Adapter")}, - {PRISM_USB_DEVICE(0x0411, 0x0027, "Melco WLI-USB-KS11G 11Mbps WLAN Adapter")}, -- {PRISM_USB_DEVICE(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")}, -+ {PRISM_USB_DEVICE(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")}, - {PRISM_USB_DEVICE(0x0846, 0x4110, "NetGear MA111")}, -- {PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")}, -+ {PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")}, - // {PRISM_USB_DEVICE(0x0ace, 0x1201, "ZyDAS ZD1201 Wireless USB Adapter")}, - {PRISM_USB_DEVICE(0x2821, 0x3300, "ASUS-WL140 Wireless USB Adapter")}, - {PRISM_USB_DEVICE(0x2001, 0x3700, "DWL-122 Wireless USB Adapter")}, -@@ -48,6 +48,7 @@ - {PRISM_USB_DEVICE(0x0411, 0x0044, "Melco WLI-USB-KB11 11Mbps WLAN Adapter")}, - {PRISM_USB_DEVICE(0x1668, 0x6106, "ROPEX FreeLan 802.11b USB Adapter")}, - {PRISM_USB_DEVICE(0x124a, 0x4017, "Pheenet WL-503IA 802.11b USB Adapter")}, -+ {PRISM_USB_DEVICE(0x0bb2, 0x0302, "Ambit Microsystems Corp. CE-WL08 802.11b WLAN Module")}, - { /* terminator */ } - }; - diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/OZ-Configure.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/OZ-Configure.patch deleted file mode 100644 index 3ec9d617c7..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/OZ-Configure.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- linux-wlan-ng-0.2.1pre22/Configure-dist 2004-08-05 00:55:27.000000000 +1000 -+++ linux-wlan-ng-0.2.1pre22/Configure 2004-10-28 02:28:06.000000000 +1000 -@@ -431,16 +431,8 @@ - if [ -d /etc/rc.d/init.d -o -d /etc/init.d -o -d /sbin/init.d ] ; then - $ECHO "It looks like you have a System V init file setup." - SYSV_INIT=y -- if [ -d /etc/rc.d/init.d ] ; then -- $ECHO "RC_DIR=/etc/rc.d" >> $CONFIG -- $ECHO "RC_DIR=/etc/rc.d" >> $CONFIG_MK -- elif [ -d /sbin/init.d ] ; then -- $ECHO "RC_DIR=/sbin" >> $CONFIG -- $ECHO "RC_DIR=/sbin" >> $CONFIG_MK -- else - $ECHO "RC_DIR=/etc" >> $CONFIG - $ECHO "RC_DIR=/etc" >> $CONFIG_MK -- fi - else - $ECHO "It looks like you have a BSD-ish init file setup." - if ! grep rc.wlan /etc/rc.d/rc.S >/dev/null ; then diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.in deleted file mode 100644 index dd672d2184..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=1 -WLAN_EXTRAVERSION=-pre22 -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC= -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/rc.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD=y -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=y -CROSS_COMPILE= -HOST_COMPILE= -#PRISM2_PLX=n -#PRISM2_PCMCIA=n -#PRISM2_PCI=y -#PRISM2_USB=n diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.mk b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.mk deleted file mode 100644 index 09ad89d965..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/config.mk +++ /dev/null @@ -1,41 +0,0 @@ -PRISM2_PCMCIA=y -PRISM2_PLX=n -PRISM2_PCI=n -PRISM2_USB=y -LINUX_SRC=$(KERNEL_SOURCE) -# KERN_25=y -CONFIG_NETLINK=y -CONFIG_PACKET=y -CONFIG_HOTPLUG=y -KERNEL_CFLAGS=-D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe --mpreferred-stack-boundary=2 -funit-at-a-time -Wdeclaration-after-statement -KERNEL_MODFLAGS=-DMODULE -WLAN_KERN_PCMCIA=y -TARGET_ROOT_ON_HOST=$(DESTDIR) -PCMCIA_DIR=/etc/pcmcia -TARGET_PCMCIA_DIR=/etc/pcmcia -MODDIR=/lib/modules/$(KERNEL_VERSION) -TARGET_MODDIR=$(TARGET_ROOT_ON_HOST)/$(MODDIR) -INST_EXEDIR=/sbin -TARGET_INST_EXEDIR=$(TARGET_ROOT_ON_HOST)/sbin -RC_DIR=/etc -SYSV_INIT=y -# INSTALL_DEPMOD is not defined -HOST_COMPILE= -HOST_CFLAGS=$(CFLAGS) -HOST_AS=$(HOST_COMPILE)as -HOST_LD=$(HOST_COMPILE)ld -HOST_CC=$(HOST_COMPILE)gcc -HOST_CPP=$(HOST_CC) -E -HOST_AR=$(HOST_COMPILE)ar -HOST_NM=$(HOST_COMPILE)nm -HOST_STRIP=$(HOST_COMPILE)strip -HOST_OBJCOPY=$(HOST_COMPILE)objcopy -HOST_OBJDUMP=$(HOST_COMPILE)objdump -HOST_RANLIB=$(HOST_COMPILE)ranlib -HOST_MAKE=make -CROSS_COMPILE=y -# CROSS_COMPILE_ENABLED is not defined -MAKE=make -# WLAN_DEBUG is not defined -FIRMWARE_DIR=/etc/wlan/ diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/no-compat.patch deleted file mode 100644 index 4f59f0fa5d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/no-compat.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# 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.1-pre23/pass-kernel-cross.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/pass-kernel-cross.patch deleted file mode 100644 index c9c00cdc25..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/pass-kernel-cross.patch +++ /dev/null @@ -1,140 +0,0 @@ ---- src/p80211/Makefile.orig 2004-09-13 16:53:46.000000000 +0200 -+++ src/p80211/Makefile 2004-10-18 18:20:37.130194928 +0200 -@@ -44,6 +44,13 @@ - - include $(WLAN_SRC)../../config.mk - -+passvars = \ -+ KERNEL_PATH='$(KERNEL_PATH)' \ -+ KERNEL_SRC='$(KERNEL_SRC)' \ -+ KERNEL_VERSION='$(KERNEL_VERSION)' \ -+ CC='$(KERNEL_CC)' \ -+ LD='$(KERNEL_LD)' -+ - ifeq ($(WLAN_DEBUG), y) - WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG - endif -@@ -89,11 +96,11 @@ - fi - - $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \ -- MODVERDIR=$(PWD)/../.tmp_versions modules -+ MODVERDIR=$(PWD)/../.tmp_versions $(passvars) modules - else # kbuild 2.4 - - $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \ -- modules -+ $(passvars) modules - endif # kbuild switch - - endif # KERNELRELEASE ---- src/prism2/driver/Makefile.orig 2004-08-04 19:27:56.000000000 +0200 -+++ src/prism2/driver/Makefile 2004-10-18 18:20:06.614833968 +0200 -@@ -44,6 +44,13 @@ - - include $(WLAN_SRC)../../../config.mk - -+passvars = \ -+ KERNEL_PATH='$(KERNEL_PATH)' \ -+ KERNEL_SRC='$(KERNEL_SRC)' \ -+ KERNEL_VERSION='$(KERNEL_VERSION)' \ -+ CC='$(KERNEL_CC)' \ -+ LD='$(KERNEL_LD)' -+ - ifeq ($(WLAN_DEBUG), y) - WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG - endif -@@ -85,11 +92,11 @@ - default: - ifeq ($(KERN_25), y) - $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \ -- MODVERDIR=$(PWD)/../.tmp_versions modules -+ MODVERDIR=$(PWD)/../.tmp_versions $(passvars) modules - else # kbuild 2.4 - - $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \ -- modules -+ $(passvars) modules - - endif # kbuild switch - ---- src/prism2/Makefile.orig 2004-02-13 19:47:37.000000000 +0100 -+++ src/prism2/Makefile 2004-10-18 18:19:13.511906840 +0200 -@@ -44,6 +44,13 @@ - - include ../../config.mk - -+passvars = \ -+ KERNEL_PATH='$(KERNEL_PATH)' \ -+ KERNEL_SRC='$(KERNEL_SRC)' \ -+ KERNEL_VERSION='$(KERNEL_VERSION)' \ -+ KERNEL_CC='$(KERNEL_CC)' \ -+ KERNEL_LD='$(KERNEL_LD)' -+ - DIRS=driver ridlist download - - ifneq ($(wildcard *.addon),) -@@ -51,10 +58,10 @@ - endif - - all: -- set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done -+ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars); done - - clean: -- set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done -+ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) clean ; done - rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags - for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done - -@@ -68,7 +75,7 @@ - cp $$x $(TARGET_ROOT_ON_HOST)$(FIRMWARE_DIR)/prism2_`echo $$x | cut -c1-2`.hex ; \ - fi; \ - done -- set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done -+ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) install ; done - - ctags: - ctags -R ---- Makefile.orig 2004-02-13 19:47:36.000000000 +0100 -+++ Makefile 2004-10-18 18:16:58.126488552 +0200 -@@ -42,6 +42,12 @@ - # - # -------------------------------------------------------------------- - -+passvars = \ -+ KERNEL_PATH='$(KERNEL_PATH)' \ -+ KERNEL_SRC='$(KERNEL_SRC)' \ -+ KERNEL_VERSION='$(KERNEL_VERSION)' \ -+ KERNEL_CC='$(KERNEL_CC)' \ -+ KERNEL_LD='$(KERNEL_LD)' - - DIRS = src doc man etc - -@@ -60,7 +66,7 @@ - @echo " " - - all: config.mk -- set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done -+ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars); done - - mrproper: clean - rm -f config.out -@@ -68,7 +74,7 @@ - - clean: - touch config.mk config.new -- set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done -+ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) clean ; done - rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags - for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done - rm -f config.mk config.new -@@ -76,7 +82,7 @@ - - install: - find . -name .depend -exec rm {} \; -- set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done -+ set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) install ; done - - auto_config config.mk: - @touch config.mk config.new diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/scripts-makefile-hostcc.diff b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/scripts-makefile-hostcc.diff deleted file mode 100644 index 6f0fc5b61c..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/scripts-makefile-hostcc.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/Makefile.o 2004-10-06 10:16:13.271421032 +0200 -+++ scripts/Makefile 2004-10-06 10:16:34.136249096 +0200 -@@ -24,7 +24,7 @@ - exit 1;\ - fi - -- $(CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version -+ $(BUILD_CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version - - get_options: - $(MAKE) -f $(CURR_DIR)/Makefile.get_options -C $(KERNEL_SOURCE) get_version_target diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/version.h b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/version.h deleted file mode 100644 index 8f884dcb47..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre23/version.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _WLAN_VERSION_H -#define _WLAN_VERSION_H -#ifndef KERNEL_VERSION -#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -#endif - -/* WLAN_HOSTIF (generally set on the command line, not detected) */ -#define WLAN_PCMCIA 1 -#define WLAN_ISA 2 -#define WLAN_PCI 3 -#define WLAN_USB 4 -#define WLAN_PLX 5 -#define WLAN_SLAVE 6 -#define WLAN_RELEASE "0.2.1-pre21" -#define WLAN_RELEASE_CODE 0x000201 -#define WLAN_BUILD_DATE "Yesterday Night" - -#endif - diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre23.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre23.bb deleted file mode 100644 index d2d4b8c303..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre23.bb +++ /dev/null @@ -1,79 +0,0 @@ -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" -MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -LICENSE = "GPL" -PR = "r1" - -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://scripts-makefile-hostcc.diff;patch=1;pnum=0 \ - file://pass-kernel-cross.patch;patch=1;pnum=0 \ - file://OZ-Configure.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://config.in \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down" -S = "${WORKDIR}/linux-wlan-ng-0.2.1pre23" - -inherit module - -MAKE_TARGETS = "all" - -do_configure() { - cp ${WORKDIR}/config.in ${S} - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - export PRISM2_PCMCIA=y - export WLAN_KERN_PCMCIA=y - fi - export PRISM2_PCI=y - export PRISM2_PLX=n - export PRISM2_USB=y - export TARGET_ROOT_ON_HOST=${D} - export RC_DIR=${sysconfdir} - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config -} - -# override module_do_install in module.oeclass - dont want to set CC and -# LD unless actually compiling the kernel modules - there are other user -# level programs to be compiled. Note we need to use same compiler -# that was used to build the kernel -do_compile() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - KERNEL_CC="${KERNEL_CC}" KERNEL_LD="${KERNEL_LD}" \ - ${MAKE_TARGETS} -} - -do_install() { - oe_runmake install DESTDIR=${D} TARGET_MODDIR= - echo "YYYYYYYYYYYYYYYYY" - 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} - mv ${D}/usr/local/man/* ${D}${mandir} - rm -r ${D}/usr/local/man - rm -rf ${D}/${sysconfdir}/init.d -} - -PACKAGES_prepend = "wlan-ng-utils " -FILES_wlan-ng-utils = "${sysconfdir} /sbin" -FILES_${PN} = "/lib" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb index ccbf310b3f..23bd888650 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb @@ -6,6 +6,9 @@ RRECOMMENDS = "wlan-ng-utils" LICENSE = "GPL" PR = "r0" +# missing symbols on module load +DEFAULT_PREFERENCE = "-1" + 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 \ |