Fix compat-wireless module path.

Add patch to compile it for xen kernel.
This commit is contained in:
Arne Fitzenreiter
2010-05-27 20:45:50 +02:00
parent 575ea031f3
commit 006ffcfe71
3 changed files with 26 additions and 6 deletions

View File

@@ -77,6 +77,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(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
@@ -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) \
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/

View File

@@ -349,6 +349,7 @@ buildipfire() {
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

View File

@@ -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)