X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux;h=3816ef329453eefd5387d9d0b8792a85869e4401;hp=0e452703e24cc725200d000e2c3f8f395dac6e08;hb=769c84ce599b86f814003f86b0bb60ff2eff7d23;hpb=eb91255c85fd61407f01a3ac13fc3466163c5c36

diff --git a/lfs/linux b/lfs/linux
index 0e452703e2..3816ef3294 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .17
-VER        = 2.6.32.17
+PATCHLEVEL = .21
+VER        = 2.6.32.21
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,7 +35,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG	   = linux-xen
-PAK_VER    = 11
+PAK_VER    = 12
 DEPS	   = ""
 
 # Normal build or XEN build.
@@ -57,21 +57,21 @@ objects =$(DL_FILE) \
 	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-2a.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-2a.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2
+xen-patches-2.6.32-2c.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2
 
-$(DL_FILE)_MD5				= 33e4f0d69e5d4cb0c1bb2357b27a05be
+$(DL_FILE)_MD5				= e4acefa00c5b8fcc539d9cbf34d88cdb
 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-2a.tar.bz2_MD5	= bccb78b9712cb538c6ddadff1dae0ddc
+xen-patches-2.6.32-2c.tar.bz2_MD5	= 62a75ddcba43894b20f754a94b299ce6
 
 install : $(TARGET)
 
@@ -109,7 +109,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-2a.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]"; \
@@ -144,9 +144,6 @@ endif
 	# 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
 
@@ -177,12 +174,6 @@ 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