Readd and update compat-wireless (2.6.34).

diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless
new file mode 100644 (file)
index 0000000..3f88467
--- /dev/null
+++ b/config/rootfiles/common/compat-wireless
@@ -0,0 +1,16 @@
+etc/udev/rules.d/50-compat_firmware.rules
+#lib/modules/2.6.32.12-ipfire/kernel/compat
+#lib/modules/2.6.32.12-ipfire/kernel/compat/compat.ko
+#lib/modules/2.6.32.12-ipfire/kernel/compat/compat_firmware_class.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/bluetooth/ath3k.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/bluetooth/bpa10x.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/bluetooth/hci_uart.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+#lib/modules/2.6.32.12-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+#lib/modules/2.6.32.12-ipfire/kernel/net/bluetooth/bluetooth.ko
+lib/udev/compat_firmware.sh

diff --git a/config/rootfiles/core/38/filelists/compat-wireless b/config/rootfiles/core/38/filelists/compat-wireless
new file mode 120000 (symlink)
index 0000000..5b5ac9e
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/compat-wireless
@@ -0,0 +1 @@
+../../../common/compat-wireless
\ No newline at end of file

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d8bf7d360f37a19b4c844736a0c624dbb02844dc..90cadc87ddb96302b97a985f18be4d1a77672c3c 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -68,6 +68,7 @@
 * clamav-0.96
 * cmake-2.4.8
 * collectd-4.9.1
 * clamav-0.96
 * cmake-2.4.8
 * collectd-4.9.1

+* compat-wireless-2.6.34-kmod-2.6.32.12-ipfire

 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-007
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-007


@@ -329,8 +330,8 @@
 * usb-modeswitch-1.1.2
 * usbutils-0.72
 * util-linux-2.12r
 * usb-modeswitch-1.1.2
 * usbutils-0.72
 * util-linux-2.12r

-* v4l-dvb-ee9826bc7106-kmod-2.6.32.12-ipfire
-* v4l-dvb-ee9826bc7106-kmod-2.6.32.12-ipfire-xen
+* v4l-dvb-b576509ea6d2-kmod-2.6.32.12-ipfire
+* v4l-dvb-b576509ea6d2-kmod-2.6.32.12-ipfire-xen

 * vdr-1.6.0
 * vdradmin-am-3.6.5
 * vim-7.0
 * vdr-1.6.0
 * vdradmin-am-3.6.5
 * vim-7.0

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
new file mode 100644 (file)
index 0000000..080d2ad
--- /dev/null
+++ b/lfs/compat-wireless
@@ -0,0 +1,104 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+
+VER        = 2.6.34
+
+THISAPP    = compat-wireless-$(VER)
+DL_FILE    = compat-wireless-$(VER).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 951e15df527eb89f3c9deb752c709fb3
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
+
+       # 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
+       echo "CONFIG_RT2800USB_UNKNOWN=y" >> $(DIR_APP)/config.mk
+
+       # Copy USB-Net drivers from Kernel...
+       mkdir $(DIR_APP)/drivers/net/usb/new
+       cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new
+       cp /usr/src/linux/drivers/net/usb/{*.c,*.h,Makefile} $(DIR_APP)/drivers/net/usb
+       cp $(DIR_APP)/drivers/net/usb/new/*.c $(DIR_APP)/drivers/net/usb
+
+       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=' KMODDIR=kernel install-modules
+
+       cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
+               KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel btinstall
+
+       # Install firmware udev files...
+       cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/
+       cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/
+
+       -rm -rf $(DIR_APP)
+       @$(POSTBUILD)

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

+  ipfiremake compat-wireless

   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio

diff --git a/src/patches/compat-wireless-2.6.34-usbnet_compile.patch b/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
new file mode 100644 (file)
index 0000000..36146fb
--- /dev/null
+++ b/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
@@ -0,0 +1,28 @@
+diff -Naur compat-wireless-2.6.34.org/include/linux/usb/usbnet.h compat-wireless-2.6.34/include/linux/usb/usbnet.h
+--- compat-wireless-2.6.34.org/include/linux/usb/usbnet.h      2010-05-18 03:12:10.000000000 +0200
++++ compat-wireless-2.6.34/include/linux/usb/usbnet.h  2010-05-22 22:18:34.000000000 +0200
+@@ -214,4 +214,24 @@
+ extern void usbnet_get_drvinfo (struct net_device *, struct ethtool_drvinfo *);
+ extern int usbnet_nway_reset(struct net_device *net);
+ 
++/* messaging support includes the interface name, so it must not be
++ * used before it has one ... notably, in minidriver bind() calls.
++ */
++#ifdef DEBUG
++#define devdbg(usbnet, fmt, arg...) \
++      printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
++#else
++#define devdbg(usbnet, fmt, arg...) \
++      ({ if (0) printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , \
++              ## arg); 0; })
++#endif
++
++#define deverr(usbnet, fmt, arg...) \
++      printk(KERN_ERR "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
++#define devwarn(usbnet, fmt, arg...) \
++      printk(KERN_WARNING "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
++
++#define devinfo(usbnet, fmt, arg...) \
++      printk(KERN_INFO "%s: " fmt "\n" , (usbnet)->net->name , ## arg); \
++
+ #endif /* __LINUX_USB_USBNET_H */