X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux;h=8a6e7e44e586c80ce71a9450a975a6352b458a74;hp=91b2968c939ee7ff66de2b08cfb312ef02fcd615;hb=9c6192caf91165d9b25f9830bb51b509790cac91;hpb=030a57c5e89e0523faaf950d1cf594aaaaa886af

diff --git a/lfs/linux b/lfs/linux
index 91b2968c93..8a6e7e44e5 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .15
-VER        = 2.6.32.15
+PATCHLEVEL = .17
+VER        = 2.6.32.17
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -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-2.tar.bz2
+	xen-patches-2.6.32-2a.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-2a.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2
 
-$(DL_FILE)_MD5				= 1cbbf16e93bbe03368172872690600c0
+$(DL_FILE)_MD5				= 33e4f0d69e5d4cb0c1bb2357b27a05be
 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-2.tar.bz2_MD5	= bccb78b9712cb538c6ddadff1dae0ddc
 
 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-2.tar.bz2
+	cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2a.tar.bz2
 
 	for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
 		echo "*********** [Patch: $$x]"; \
@@ -141,10 +141,6 @@ endif
 	# 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
 
@@ -184,15 +180,28 @@ endif
 	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 all framebuffer modules
+	# 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 ; \
 	done
+	# Blacklist new drm framebuffer modules
+	for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \
+		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-*