diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | conf/tosa.conf | 4 | ||||
| -rw-r--r-- | wlan-ng/files/Ambit_usb.patch | 0 | ||||
| -rw-r--r-- | wlan-ng/files/config.mk | 41 | ||||
| -rw-r--r-- | wlan-ng/files/no-compat.patch | 47 | ||||
| -rw-r--r-- | wlan-ng/files/usbctl | 0 | ||||
| -rw-r--r-- | wlan-ng/files/wlan-ng.modutils | 0 | ||||
| -rw-r--r-- | wlan-ng/files/wlan.agent | 0 | ||||
| -rw-r--r-- | wlan-ng/wlan-ng-modules_0.2.1pre21.oe | 38 |
9 files changed, 130 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1139ac192c..02aa2e8684 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -19,6 +19,7 @@ hrw@home.hrw.one.pl hrw@marcinj.local ich@debian.(none) jcrouse@forsteri.amd.com +jgrant@desknote.thegrantclan.org joshin@styx.techsurgeons.com kebert@geralt.doma kergoth@beast.local diff --git a/conf/tosa.conf b/conf/tosa.conf index b136797943..2779eff314 100644 --- a/conf/tosa.conf +++ b/conf/tosa.conf @@ -5,4 +5,6 @@ include conf/zaurus-pxa.conf BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules" -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils" +BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm kernel-module-evdev kernel-module-net-fd kernel-module-pxa-bi kernel-module-registers kernel-module-storage-fd kernel-module-usb-ohci-tc6393 kernel-module-usb-storage kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor" + +RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd kernel-module-usbmouse kernel-module-hid usbutils" diff --git a/wlan-ng/files/Ambit_usb.patch b/wlan-ng/files/Ambit_usb.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/wlan-ng/files/Ambit_usb.patch diff --git a/wlan-ng/files/config.mk b/wlan-ng/files/config.mk index e69de29bb2..09ad89d965 100644 --- a/wlan-ng/files/config.mk +++ b/wlan-ng/files/config.mk @@ -0,0 +1,41 @@ +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/wlan-ng/files/no-compat.patch b/wlan-ng/files/no-compat.patch index e69de29bb2..4f59f0fa5d 100644 --- a/wlan-ng/files/no-compat.patch +++ b/wlan-ng/files/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/wlan-ng/files/usbctl b/wlan-ng/files/usbctl new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/wlan-ng/files/usbctl diff --git a/wlan-ng/files/wlan-ng.modutils b/wlan-ng/files/wlan-ng.modutils new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/wlan-ng/files/wlan-ng.modutils diff --git a/wlan-ng/files/wlan.agent b/wlan-ng/files/wlan.agent new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/wlan-ng/files/wlan.agent diff --git a/wlan-ng/wlan-ng-modules_0.2.1pre21.oe b/wlan-ng/wlan-ng-modules_0.2.1pre21.oe index e69de29bb2..861b953295 100644 --- a/wlan-ng/wlan-ng-modules_0.2.1pre21.oe +++ b/wlan-ng/wlan-ng-modules_0.2.1pre21.oe @@ -0,0 +1,38 @@ +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 = "r3" + +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://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 +} + +sbindir = "/sbin" +PACKAGES_prepend = "wlan-ng-utils " +FILES_wlan-ng-utils = "${sysconfdir} ${sbindir}" |