summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Opfer <dirk@opfer-online.de>2006-04-02 10:23:10 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-02 10:23:10 +0000
commitf0042bdf16abf1fde246a8aa843268ecfc3539ea (patch)
treef75d883e263c275c53c4ad4babcd13f9fcfef833
parentca7f0e698ae67a0da02f2d9f5cebc63610f0b6cb (diff)
Packages/wlan-ng: make current svn compile
- fix PV - disable pci and cs driver, because we don't need them - update usb patch
-rw-r--r--packages/wlan-ng/wlan-ng-modules.inc8
-rw-r--r--packages/wlan-ng/wlan-ng-modules/config.in6
-rw-r--r--packages/wlan-ng/wlan-ng-modules/usb-owner.patch8
-rw-r--r--packages/wlan-ng/wlan-ng-modules_svn.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-utils_svn.bb2
5 files changed, 13 insertions, 13 deletions
diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index b27bad1a38..8be211d4c9 100644
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -25,10 +25,10 @@ do_configure() {
install -m 0655 ${WORKDIR}/config.in ${S}/config.in
oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
- if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
- echo "PRISM2_PCMCIA=y" >> config.mk
- echo "WLAN_KERN_PCMCIA=y" >> config.mk
- fi
+# if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+# echo "PRISM2_PCMCIA=y" >> config.mk
+# echo "WLAN_KERN_PCMCIA=y" >> config.mk
+# fi
echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk
echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
echo "CC=${KERNEL_CC}" >> config.mk
diff --git a/packages/wlan-ng/wlan-ng-modules/config.in b/packages/wlan-ng/wlan-ng-modules/config.in
index 9a34bf5f7b..a2b245e967 100644
--- a/packages/wlan-ng/wlan-ng-modules/config.in
+++ b/packages/wlan-ng/wlan-ng-modules/config.in
@@ -15,7 +15,7 @@ WLAN_DEBUG=n
CROSS_COMPILE_ENABLED=n
CROSS_COMPILE=
HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
+PRISM2_PLX=n
+PRISM2_PCMCIA=n
+PRISM2_PCI=n
PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-modules/usb-owner.patch b/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
index aa66ceeef9..06a305548e 100644
--- a/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
+++ b/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
@@ -1,13 +1,13 @@
Index: trunk/src/prism2/driver/prism2_usb.c
===================================================================
---- trunk.orig/src/prism2/driver/prism2_usb.c 2006-03-22 09:10:51.049384984 +0100
-+++ trunk/src/prism2/driver/prism2_usb.c 2006-03-22 09:14:39.152708008 +0100
+--- trunk.orig/src/prism2/driver/prism2_usb.c 2006-04-02 11:06:32.045530320 +0200
++++ trunk/src/prism2/driver/prism2_usb.c 2006-04-02 11:09:31.080312896 +0200
@@ -313,7 +313,7 @@
struct usb_driver prism2_usb_driver = {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)))
.owner = THIS_MODULE,
#endif
.name = "prism2_usb",
diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb
index 01457bbae3..4fa16c4de8 100644
--- a/packages/wlan-ng/wlan-ng-modules_svn.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,6 +1,6 @@
include wlan-ng-modules.inc
PR = "r0"
-PV = "0.23+svn${SRCDATE}"
+PV = "0.2.3+svn${SRCDATE}"
SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
S = "${WORKDIR}/trunk"
diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index b57a0dffd5..a5762e32aa 100644
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/userland"
DEPENDS = "virtual/kernel"
LICENSE = "GPL"
PR = "r0"
-PV = "0.23+svn${SRCDATE}"
+PV = "0.2.3+svn${SRCDATE}"
SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
file://only-the-utils.patch;patch=1 \