From 0ce16eecead9c212e62bcfe561a2be35228e72f2 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 16 Mar 2008 03:18:43 +0000 Subject: wlan-ng: close oebug 4044, oebug 4052 * oebug 4044: add RPROVIDES = wlan-ng-modules, prevent dependency on old 0.2.1-pre26 * oebug 4052: 0.2.8 svn bump to 20080315 to be compatible with 2.6.24 kernel * clean up 0.2.1-pre26 --- .../.mtn2git_empty | 0 .../wlan-ng-modules-0.2.8+svn20071030/config.in | 21 ---------------- .../only-the-modules.patch | 26 ------------------- .../.mtn2git_empty | 0 .../wlan-ng-modules-0.2.8+svn20080315/config.in | 21 ++++++++++++++++ .../only-the-modules.patch | 26 +++++++++++++++++++ packages/wlan-ng/wlan-ng-modules.inc | 2 +- packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb | 29 +++------------------- .../wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb | 9 ------- .../wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb | 9 +++++++ 10 files changed, 60 insertions(+), 83 deletions(-) delete mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty delete mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in delete mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch delete mode 100644 packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb create mode 100644 packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in deleted file mode 100644 index a2bc086629..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=8 -WLAN_EXTRAVERSION=svn20071030 -#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=n -PRISM2_PCMCIA=n -PRISM2_PCI=n -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch deleted file mode 100644 index abb3b137da..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: trunk/src/Makefile -=================================================================== ---- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 -+++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../config.mk - --DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 -+DIRS=mkmeta shared p80211 prism2 - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` -Index: trunk/src/prism2/Makefile -=================================================================== ---- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 -+++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 -@@ -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.8+svn20080315/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in new file mode 100644 index 0000000000..a2bc086629 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in @@ -0,0 +1,21 @@ +WLAN_VERSION=0 +WLAN_PATCHLEVEL=2 +WLAN_SUBLEVEL=8 +WLAN_EXTRAVERSION=svn20071030 +#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=n +PRISM2_PCMCIA=n +PRISM2_PCI=n +PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch new file mode 100644 index 0000000000..abb3b137da --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared p80211 prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 +@@ -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.inc b/packages/wlan-ng/wlan-ng-modules.inc index 4cf0733e7a..20d7389512 100644 --- a/packages/wlan-ng/wlan-ng-modules.inc +++ b/packages/wlan-ng/wlan-ng-modules.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.linux-wlan.org" SECTION = "kernel/modules" DEPENDS = "virtual/kernel" RRECOMMENDS = "wlan-ng-utils" -RPROVIDES += "wlan-ng-modules-usb" +RPROVIDES += "wlan-ng-modules-usb wlan-ng-modules" LICENSE = "GPL" SRC_URI = "file://no-compat.patch;patch=1 \ diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb index d9597febe4..cb6edc97dc 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb @@ -1,20 +1,11 @@ -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 = "r2" +require wlan-ng-modules.inc + +PR = "r3" SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \ file://no-compat.patch;patch=1 \ file://only-the-modules.patch;patch=1 \ file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -inherit module - -PARALLEL_MAKE = "" do_configure() { install -m 0655 ${WORKDIR}/config.in ${S}/config.in @@ -39,17 +30,3 @@ do_configure() { 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-modules_0.2.8+svn20071030.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb deleted file mode 100644 index 8e885b5ad2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb +++ /dev/null @@ -1,9 +0,0 @@ -require wlan-ng-modules.inc - -SRCDATE = "20071030" -PV = "0.2.8+svn${SRCDATE}" - -SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " - -S = "${WORKDIR}/trunk" - diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb new file mode 100644 index 0000000000..f1fadadd09 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb @@ -0,0 +1,9 @@ +require wlan-ng-modules.inc + +SRCDATE = "20080315" +PV = "0.2.8+svn${SRCDATE}" + +SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " + +S = "${WORKDIR}/trunk" + -- cgit v1.2.3