summaryrefslogtreecommitdiff
path: root/packages/wlan-ng
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-09-12 10:20:43 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-12 10:20:43 +0000
commit8ede563e65a8b5dfbfbd1daaf4dff8aed3e3a8e9 (patch)
tree7f1459c745d086e37d29153d1fe1d26912599f8f /packages/wlan-ng
parent9e184abb76de11a7f3441cf9e981150cf972553d (diff)
wlan-ng: resolve several issues in our wlan-ng 0.2.2 build
patch courtesy Frederic Devernay, thanks!
Diffstat (limited to 'packages/wlan-ng')
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch43
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/config.in4
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch16
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch19
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch7
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch45
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch16
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.2.bb6
-rw-r--r--packages/wlan-ng/wlan-ng-utils-0.2.2/config.in6
-rw-r--r--packages/wlan-ng/wlan-ng-utils_0.2.2.bb2
10 files changed, 115 insertions, 49 deletions
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch
deleted file mode 100644
index a8182076d7..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c~compile-fix-HACK.patch
-+++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c
-@@ -21,15 +21,6 @@
- * is set to and what the CIS
- * says.
- */
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
--#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,5))
--static int numlist = 4;
--module_param_array(irq_list, int, numlist, 0444);
--#else
--module_param_array(irq_list, int, NULL, 0444);
--#endif
--module_param( irq_mask, int, 0644);
--#endif
-
- static dev_link_t *dev_list = NULL; /* head of instance list */
-
---- linux-wlan-ng-0.2.2/src/prism2/driver/hfa384x_usb.c~compile-fix-HACK.patch
-+++ linux-wlan-ng-0.2.2/src/prism2/driver/hfa384x_usb.c
-@@ -3240,7 +3240,7 @@
- int result;
- DBFENTER;
-
-- might_sleep();
-+ might_sleep(0);
-
- if (usb_clear_halt(hw->usb, hw->endp_in)) {
- WLAN_LOG_ERROR(
-@@ -3316,7 +3316,7 @@
- int i;
- DBFENTER;
-
-- might_sleep();
-+ might_sleep(0);
-
- /* There's no need for spinlocks here. The USB "disconnect"
- * function sets this "removed" flag and then calls us.
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
index 5b9b7c780c..69f8ac1db2 100644
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
@@ -1,7 +1,7 @@
WLAN_VERSION=0
WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=1
-WLAN_EXTRAVERSION=-pre26
+WLAN_SUBLEVEL=2
+WLAN_EXTRAVERSION=
#LINUX_SRC=$(KERNEL_SOURCE)
PCMCIA_SRC=
PREFIX=
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch
new file mode 100644
index 0000000000..a156229331
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/src/include/wlan/wlan_compat.h~might_sleep
++++ linux-wlan-ng-0.2.2/src/include/wlan/wlan_compat.h
+@@ -584,7 +584,7 @@
+ #endif
+
+ #ifndef might_sleep
+-#define might_sleep(a) do { } while (0)
++#define might_sleep() do { } while (0)
+ #endif
+
+ /* Apparently 2.4.2 ethtool is quite different, maybe newer too? */
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch
new file mode 100644
index 0000000000..a22d39dca2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch
@@ -0,0 +1,19 @@
+--- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c~ 2005-07-20 19:16:55.000000000 +0200
++++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c 2005-09-01 19:02:59.099563318 +0200
+@@ -22,12 +22,16 @@
+ * says.
+ */
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,5))
+ static int numlist = 4;
+ module_param_array(irq_list, int, numlist, 0444);
+ #else
+ module_param_array(irq_list, int, NULL, 0444);
+ #endif
++#else
++MODULE_PARM( irq_list, "1-4i" );
++#endif
+ module_param( irq_mask, int, 0644);
+ #endif
+
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch
new file mode 100644
index 0000000000..4ce8173f93
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch
@@ -0,0 +1,7 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/wlan_compat.h
++++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch
new file mode 100644
index 0000000000..ea76baa98b
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch
@@ -0,0 +1,45 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/Configure~pcmciasrc
++++ linux-wlan-ng-0.2.2/Configure
+@@ -358,37 +358,6 @@
+ # kernel PCMCIA.
+
+ if [ $WLAN_KERN_PCMCIA != "y" ] ; then
+- if [ ! "$PCMCIA_SRC" ] ; then
+- if [ -f /sbin/cardctl ] ; then
+- PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'`
+- PCMCIA_SRC=/usr/src/pcmcia-cs-$PCMCIA_SRC
+- fi
+- fi
+- ask_str "pcmcia-cs source dir" PCMCIA_SRC
+-
+- if [ ! -f $PCMCIA_SRC/Makefile ] ; then
+- $ECHO "pcmcia-cs source tree $PCMCIA_SRC is incomplete or missing!"
+- $ECHO "The wlan driver for pcmcia cannot be built without "
+- $ECHO "the pcmcia-cs source tree present and configured."
+- fail
+- fi
+- if [ ! -f $PCMCIA_SRC/include/pcmcia/config.h ] ; then
+- $ECHO "The pcmcia-cs source tree does not appear to be configured."
+- $ECHO "The wlan driver for pcmcia cannot be built without "\
+- $ECHO "the pcmcia-cs source tree present and configured."
+- fail
+- fi
+- $ECHO ""
+-
+- # Now we need to generate the module options flags.
+- # It's only relevant if modversions is turned on.
+- grep CONFIG_MODVERSIONS=y < $PCMCIA_SRC/config.mk > /dev/null
+- if [ $? = 0 ] ; then
+- PCMCIA_MODFLAGS="-DMODULE -DMODVERSIONS -include $PCMCIA_SRC/include/linux/modversions.h"
+- else
+- PCMCIA_MODFLAGS="-DMODULE"
+- fi
+-
+ # new versions of pcmcia-cs don't generate their own modversion.h
+ # if they don't have it, use the kernel module flags instead.
+ if [ ! -f $PCMCIA_SRC/include/linux/modversions.h ] ; then
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch
new file mode 100644
index 0000000000..1746b8a359
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/scripts/Makefile~scripts-makefile-hostcc
++++ linux-wlan-ng-0.2.2/scripts/Makefile
+@@ -24,7 +24,7 @@
+ exit 1;\
+ fi
+
+- $(CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version
++ $(BUILD_CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version
+
+ get_options:
+ $(MAKE) -f $(CURR_DIR)/Makefile.get_options -C $(KERNEL_SOURCE) get_version_target
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
index 9a482447c6..e2528a78af 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
@@ -9,8 +9,11 @@ PR = "r1"
SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://no-compat.patch;patch=1 \
file://msleep-vs-mdelay.patch;patch=1 \
+ file://might-sleep.patch;patch=1 \
file://only-the-modules.patch;patch=1 \
- file://compile-fix-HACK.patch;patch=1 \
+ file://module_param_array.patch;patch=1 \
+ file://scripts-makefile-hostcc.patch;patch=1 \
+ file://pcmciasrc.patch;patch=1 \
file://config.in"
S = "${WORKDIR}/linux-wlan-ng-${PV}"
@@ -31,6 +34,7 @@ do_configure() {
echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
echo "CC=${KERNEL_CC}" >> config.mk
echo "LD=${KERNEL_LD}" >> config.mk
+ echo "LDFLAGS=" >> config.mk
# Listen closely... sssshhh... can you hear the wlan-ng build system suck?
rm -f ${KERNEL_SOURCE}/../config.mk
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
index 5b9b7c780c..1fadad5560 100644
--- a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
@@ -1,9 +1,9 @@
WLAN_VERSION=0
WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=1
-WLAN_EXTRAVERSION=-pre26
+WLAN_SUBLEVEL=2
+WLAN_EXTRAVERSION=
#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=
+PCMCIA_SRC=.
PREFIX=
INST_EXEDIR=/sbin
#TARGET_ROOT_ON_HOST=
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb b/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
index 7d5ceda29c..17cf3cab83 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
@@ -7,6 +7,8 @@ PR = "r0"
SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://only-the-utils.patch;patch=1 \
+ file://scripts-makefile-hostcc.patch;patch=1 \
+ file://pcmciasrc.patch;patch=1 \
file://wlan-ng.modutils \
file://wlan.agent \
file://usbctl \