Fix compat-wireless module path.

Add patch to compile it for xen kernel.

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 66cf8cc471f518a8b83a2d040cd7ceb6bfa56cc1..bd26debcd8079fad2abdd8f5abf2eca191311308 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -77,6 +77,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 

+ifeq "$(XEN)" "1"
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-xen.patch
+endif
+

        # Enable some USB ID's in rt2800usb driver
        echo "CONFIG_RT2800USB_RT30XX=y"  >> $(DIR_APP)/config.mk
        echo "CONFIG_RT2800USB_RT35XX=y"  >> $(DIR_APP)/config.mk
        # Enable some USB ID's in rt2800usb driver
        echo "CONFIG_RT2800USB_RT30XX=y"  >> $(DIR_APP)/config.mk
        echo "CONFIG_RT2800USB_RT35XX=y"  >> $(DIR_APP)/config.mk


@@ -91,12 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
 
        cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
 
        cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \

-               KMODPATH_ARG='INSTALL_MOD_PATH=/lib/modules/$(KVER)-$(VERSUFIX)' KMODDIR=kernel install-modules
-
-       #cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
-       #       KMODPATH_ARG='INSTALL_MOD_PATH=/lib/modules/$(KVER)-$(VERSUFIX)' KMODDIR=kernel btinstall
-       #todo check wy maniac has commented this. My system has build it and
-       #we need the ne bt-modules.
+               KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules

 
        # Install firmware udev files...
        cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/
 
        # Install firmware udev files...
        cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/

diff --git a/make.sh b/make.sh
index 284b0339b34917ce0f952fa6f4ebe0b5c7645d08..ae19e414ad7ff9e8aa06df16f93b4be9e741008f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -349,6 +349,7 @@ buildipfire() {
   ipfiremake madwifi                   XEN=1
   ipfiremake dahdi                     XEN=1 KMOD=1
   ipfiremake cryptodev                 XEN=1
   ipfiremake madwifi                   XEN=1
   ipfiremake dahdi                     XEN=1 KMOD=1
   ipfiremake cryptodev                 XEN=1

+  ipfiremake compat-wireless           XEN=1

   ipfiremake linux
   ipfiremake kqemu
   ipfiremake kvm-kmod
   ipfiremake linux
   ipfiremake kqemu
   ipfiremake kvm-kmod

diff --git a/src/patches/compat-wireless-2.6.34-xen.patch b/src/patches/compat-wireless-2.6.34-xen.patch
new file mode 100644 (file)
index 0000000..e3a9d6a
--- /dev/null
+++ b/src/patches/compat-wireless-2.6.34-xen.patch
@@ -0,0 +1,20 @@
+diff -Naur compat-wireless-2.6.34.org/include/linux/compat-2.6.33.h compat-wireless-2.6.34/include/linux/compat-2.6.33.h
+--- compat-wireless-2.6.34.org/include/linux/compat-2.6.33.h   2010-05-18 03:11:59.000000000 +0200
++++ compat-wireless-2.6.34/include/linux/compat-2.6.33.h       2010-05-27 19:58:55.000000000 +0200
+@@ -60,16 +60,6 @@
+ /* this will never happen on older kernels */
+ #define NETDEV_POST_INIT 0xffff
+ 
+-static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+-                unsigned int length)
+-{
+-      struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN);
+-
+-      if (NET_IP_ALIGN && skb)
+-              skb_reserve(skb, NET_IP_ALIGN);
+-      return skb;
+-}
+-
+ #if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
+ 
+ #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)