X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux;h=70022d02c6bd7fcf91bf4b9e7ff0de36c8afd8b5;hp=68e7df44f7a1dffff50301d7aca517e4e1d64822;hb=98c1a5739f9a909d0d262e27d8e0cc7f11d3b32c;hpb=6886b70cfc71c0af11833c0284b42bbb4f7ef648

diff --git a/lfs/linux b/lfs/linux
index 68e7df44f7..70022d02c6 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .15
-VER        = 2.6.32.15
+PATCHLEVEL = .23
+VER        = 2.6.32.23
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,7 +35,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG	   = linux-xen
-PAK_VER    = 10
+PAK_VER    = 12
 DEPS	   = ""
 
 # Normal build or XEN build.
@@ -56,22 +56,19 @@ objects =$(DL_FILE) \
 	netfilter-layer7-v2.22.tar.gz \
 	patch-2.6.16-nath323-1.3.bz2 \
 	reiser4-for-2.6.32.patch.bz2 \
-	squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \
-	xen-patches-2.6.32-2.tar.bz2
+	xen-patches-2.6.32-2c.tar.bz2
 
 $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.22.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
 patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 reiser4-for-2.6.32.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
-squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2
-xen-patches-2.6.32-2.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2.tar.bz2
+xen-patches-2.6.32-2c.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2
 
-$(DL_FILE)_MD5				= 1cbbf16e93bbe03368172872690600c0
+$(DL_FILE)_MD5				= f9fbeb2fc55fc41e5e7df16563d33ad1
 netfilter-layer7-v2.22.tar.gz_MD5	= 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
 reiser4-for-2.6.32.patch.bz2_MD5	= 3246397973d9271eb8e6d7c97c5d2d91
-squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4
-xen-patches-2.6.32-2.tar.bz2_MD5	= d1d78d2e9b9b62dd869a490f4415de04
+xen-patches-2.6.32-2c.tar.bz2_MD5	= 62a75ddcba43894b20f754a94b299ce6
 
 install : $(TARGET)
 
@@ -109,7 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(XEN)" "1"
 	# Apply gentoo Xen patches
 	mkdir -p $(DIR_SRC)/xen-patches
-	cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2.tar.bz2
+	cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2c.tar.bz2
 
 	for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
 		echo "*********** [Patch: $$x]"; \
@@ -138,18 +135,11 @@ endif
 	cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.22/kernel-2.6.25-2.6.28-layer7-2.22.patch
 
-	# Squashfs LZMA support
-	cd $(DIR_APP) && bzcat $(DIR_DL)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 | patch -Np1
-
-	# mISDN hfcusb fixes
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb_bchannels.patch
-
 	# Add some more LED triggers
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch
 
-	# Huawei (Vodafone) K3765 & K4505 Usbids
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch
+	# Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
 
 	# Cleanup kernel source
 
@@ -178,17 +168,13 @@ ifeq "$(XEN)" ""
 	cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
 endif
 
-	# Rename ide-cd module to match with old kernel
-	mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \
-	   /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko
-	mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-gd_mod.ko \
-	   /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-disk.ko
-
-#	# Remove mISDN modules
-#	rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
-#	rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+	# Remove mISDN modules
+	rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+	rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
 
 ifneq "$(XEN)" "1"
+	# Blacklist matroxfb_base
+	echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
 	# Blacklist old framebuffer modules
 	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
@@ -198,6 +184,12 @@ ifneq "$(XEN)" "1"
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
 	done
 	sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer
+
+	# Blacklist isdn modules
+	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
+		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
+	done
+	sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
 endif
 
 	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*