summaryrefslogtreecommitdiff
path: root/packages/wlan-ng
diff options
context:
space:
mode:
Diffstat (limited to 'packages/wlan-ng')
-rw-r--r--packages/wlan-ng/wlan-ng-modules.inc27
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.3.bb3
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb3
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.7.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb3
-rw-r--r--packages/wlan-ng/wlan-ng-modules_svn.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-utils.inc2
-rw-r--r--packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-utils_0.2.3.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-utils_0.2.7.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-utils_0.2.8.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-utils_svn.bb2
15 files changed, 34 insertions, 24 deletions
diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index 20d7389512..6dbadceca8 100644
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -2,8 +2,6 @@ DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11M
HOMEPAGE = "http://www.linux-wlan.org"
SECTION = "kernel/modules"
DEPENDS = "virtual/kernel"
-RRECOMMENDS = "wlan-ng-utils"
-RPROVIDES += "wlan-ng-modules-usb wlan-ng-modules"
LICENSE = "GPL"
SRC_URI = "file://no-compat.patch;patch=1 \
@@ -55,15 +53,22 @@ do_install() {
# Listen closely... sssshhh... can you hear the wlan-ng build system suck?
rm -f ${KERNEL_SOURCE}/../config.mk
rm -f ${KERNEL_SOURCE}/../../config.mk
+
+ # man page and configure scripts are shipped by wlan-ng-utils
+ rm -rf ${D}/usr/local/man
+ rm -rf ${D}/etc
}
-PACKAGES = "${PN}-dbg wlan-ng-modules-usb wlan-ng-modules-cs wlan-ng-modules-pci wlan-ng-modules-p80211"
-FILES_wlan-ng-modules-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \
+PACKAGES =+ "${PN}-p80211 ${PN}-usb ${PN}-cs ${PN}-pci"
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \
/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_plx${KERNEL_OBJECT_SUFFIX}"
-RDEPENDS_wlan-ng-modules-p80211 = "wlan-ng-utils"
-RDEPENDS_wlan-ng-modules-usb = "wlan-ng-modules-p80211"
-RDEPENDS_wlan-ng-modules-cs = "wlan-ng-modules-p80211"
-RDEPENDS_wlan-ng-modules-pci = "wlan-ng-modules-p80211"
+
+RDEPENDS_${PN}-p80211 = "wlan-ng-utils"
+RDEPENDS_${PN} = "${PN}-p80211"
+RDEPENDS_${PN}-usb = "${PN}-p80211"
+RDEPENDS_${PN}-cs = "${PN}-p80211"
+RDEPENDS_${PN}-pci = "${PN}-p80211"
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 cb6edc97dc..f2ead8d8b3 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,6 +1,6 @@
require wlan-ng-modules.inc
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \
file://no-compat.patch;patch=1 \
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
index 2157a29fa2..6dc9be552d 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
@@ -1,9 +1,8 @@
require wlan-ng-modules.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://prism2sta_commsqual_defer.patch;patch=1 \
file://modules-symvers.patch;patch=1 \
file://usb-owner.patch;patch=1 "
S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
index ade99ac50d..9639389501 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
@@ -1,5 +1,7 @@
require wlan-ng-modules.inc
+PR = "r1"
+
SRCDATE = "20060823"
PV = "0.2.4+svn${SRCDATE}"
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
index dd320276f5..f322848d59 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
@@ -1,8 +1,9 @@
require wlan-ng-modules.inc
+PR = "r1"
+
SRCDATE = "20061109"
PV = "0.2.5+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.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
index bacd662680..a0113e9ae4 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
@@ -1,6 +1,6 @@
require wlan-ng-modules.inc
-PR = "r1"
+PR = "r2"
SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://2.6.22-fixes.patch;patch=1"
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
index f1fadadd09..4a5df48ba9 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
@@ -1,9 +1,10 @@
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
index a1826a36f3..1368729826 100644
--- a/packages/wlan-ng/wlan-ng-modules_svn.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,5 +1,5 @@
require wlan-ng-modules.inc
-PR = "r0"
+PR = "r1"
PV = "0.2.4+svn${SRCDATE}"
SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc
index fe00e161d3..bade47ce30 100644
--- a/packages/wlan-ng/wlan-ng-utils.inc
+++ b/packages/wlan-ng/wlan-ng-utils.inc
@@ -61,8 +61,8 @@ do_install() {
install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
install -d ${D}${mandir}/man1
install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
+ rm -rf ${D}/usr/local/man
}
-FILES_${PN}-doc += "/usr/local/man"
FILES_${PN}-dbg += "/sbin/.debug"
FILES_${PN} = "/etc /sbin"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
index 9ac5348a98..ff41097393 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
@@ -1,3 +1,3 @@
require wlan-ng-utils.inc
-PR = "r1"
+PR = "r2"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
index d4e0a39c70..7e28b417c9 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
@@ -1,6 +1,6 @@
require wlan-ng-utils.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
file://pcmciasrc.patch;patch=1 \
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
index f71a2ee34a..6f7c75cf7d 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
@@ -1,5 +1,7 @@
require wlan-ng-utils.inc
+PR = "r1"
+
SRCDATE = "20060823"
PV = "0.2.4+svn${SRCDATE}"
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 0b6f33e380..141ae42957 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
@@ -4,4 +4,4 @@ SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
file://pcmciasrc.patch;patch=1 \
file://hostldflags.patch;patch=1"
-PR = "r1"
+PR = "r2"
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 e37d548a9f..0b6f33e380 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
@@ -4,4 +4,4 @@ SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
file://pcmciasrc.patch;patch=1 \
file://hostldflags.patch;patch=1"
-PR = "r0"
+PR = "r1"
diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index fae48545ff..9de024f006 100644
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -1,6 +1,6 @@
require wlan-ng-utils.inc
-PR = "r2"
+PR = "r3"
PV = "0.2.4+svn${SRCDATE}"
SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \