From a47398e955d9101e78728bd94ed6811684ec4eaa Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 5 Jun 2008 21:13:44 +0000 Subject: wlan-ng: tag 0.2.8 srcrev 1859. use as default for 2.6.24 kernel * update only-the-utils.patch for wlan-ng-utils_svn --- conf/distro/include/sane-srcrevs.inc | 2 ++ .../.mtn2git_empty | 0 .../wlan-ng-modules-0.2.8+svn20080315/config.in | 21 ----------------- .../only-the-modules.patch | 26 ---------------------- .../wlan-ng-modules-0.2.8+svnr1859/.mtn2git_empty | 0 .../wlan-ng-modules-0.2.8+svnr1859/config.in | 21 +++++++++++++++++ .../only-the-modules.patch | 26 ++++++++++++++++++++++ .../wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb | 10 --------- packages/wlan-ng/wlan-ng-modules_svn.bb | 9 ++++++++ .../wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty | 0 .../wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in | 21 +++++++++++++++++ .../only-the-utils.patch | 22 ++++++++++++++++++ packages/wlan-ng/wlan-ng-utils-0.2.8/config.in | 21 ----------------- packages/wlan-ng/wlan-ng-utils.inc | 4 +--- packages/wlan-ng/wlan-ng-utils_0.2.7.bb | 7 ++++-- packages/wlan-ng/wlan-ng-utils_0.2.8.bb | 7 ++++-- packages/wlan-ng/wlan-ng-utils_svn.bb | 12 ++++++++++ 17 files changed, 124 insertions(+), 85 deletions(-) delete mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/.mtn2git_empty delete mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in delete mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/config.in create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/only-the-modules.patch delete mode 100644 packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb create mode 100644 packages/wlan-ng/wlan-ng-modules_svn.bb create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch delete mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.8/config.in create mode 100644 packages/wlan-ng/wlan-ng-utils_svn.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 65765ebcd3..d47a422e12 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -185,6 +185,8 @@ SRCREV_pn-webkit-gtk ?= "32839" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" +SRCREV_pn-wlan-ng-modules ?= "1859" +SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b" 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 deleted file mode 100644 index e69de29bb2..0000000000 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 deleted file mode 100644 index a2bc086629..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/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+svn20080315/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch deleted file mode 100644 index abb3b137da..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/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+svnr1859/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/config.in new file mode 100644 index 0000000000..a2bc086629 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/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+svnr1859/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/only-the-modules.patch new file mode 100644 index 0000000000..abb3b137da --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/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_0.2.8+svn20080315.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb deleted file mode 100644 index 4a5df48ba9..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb +++ /dev/null @@ -1,10 +0,0 @@ -require wlan-ng-modules.inc - -PR = "r1" - -SRCDATE = "20080315" -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_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb new file mode 100644 index 0000000000..c455181c6b --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_svn.bb @@ -0,0 +1,9 @@ +require wlan-ng-modules.inc + +PR = "r0" + +PV = "0.2.8+svnr${SRCREV}" + +SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " + +S = "${WORKDIR}/trunk" diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in new file mode 100644 index 0000000000..298935770d --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in @@ -0,0 +1,21 @@ +WLAN_VERSION=0 +WLAN_PATCHLEVEL=2 +WLAN_SUBLEVEL=8 +WLAN_EXTRAVERSION= +#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=y +PRISM2_PCMCIA=y +PRISM2_PCI=y +PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch new file mode 100644 index 0000000000..b6156da921 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch @@ -0,0 +1,22 @@ +--- trunk/src/Makefile.old 2008-06-05 14:52:31.000000000 -0500 ++++ trunk/src/Makefile 2008-06-05 14:53:02.000000000 -0500 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +--- trunk/src/prism2/Makefile.old 2008-06-05 14:52:47.000000000 -0500 ++++ trunk/src/prism2/Makefile 2008-06-05 14:53:10.000000000 -0500 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=ridlist download + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in deleted file mode 100644 index 298935770d..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=8 -WLAN_EXTRAVERSION= -#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=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc index bade47ce30..72976ce292 100644 --- a/packages/wlan-ng/wlan-ng-utils.inc +++ b/packages/wlan-ng/wlan-ng-utils.inc @@ -3,10 +3,8 @@ HOMEPAGE = "http://www.linux-wlan.org" SECTION = "kernel/userland" LICENSE = "GPL" DEPENDS = "virtual/kernel" -S = "${WORKDIR}/linux-wlan-ng-${PV}" -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ +SRC_URI = "file://only-the-utils.patch;patch=1 \ file://wlan-ng.modutils \ file://wlan.agent \ file://usbctl \ diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb index 141ae42957..9946a4b670 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb @@ -1,7 +1,10 @@ require wlan-ng-utils.inc -SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ +SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ + file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ file://hostldflags.patch;patch=1" -PR = "r2" +S = "${WORKDIR}/linux-wlan-ng-${PV}" + +PR = "r3" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb index 0b6f33e380..15d5e70f8e 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb @@ -1,7 +1,10 @@ require wlan-ng-utils.inc -SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ +SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ + file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ file://hostldflags.patch;patch=1" -PR = "r1" +S = "${WORKDIR}/linux-wlan-ng-${PV}" + +PR = "r2" diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb new file mode 100644 index 0000000000..096ac22055 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils_svn.bb @@ -0,0 +1,12 @@ +require wlan-ng-utils.inc + +PR = "r0" + +PV = "0.2.8+svnr${SRCREV}" + +SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ + file://scripts-makefile-hostcc.patch;patch=1 \ + file://pcmciasrc.patch;patch=1 \ + file://hostldflags.patch;patch=1" + +S = "${WORKDIR}/trunk" -- cgit v1.2.3