X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux;h=a038de08dd72ac4446dfbee67aacf50529232811;hb=e58b46c96d2f1f2bc360fda2846ba45927aa929c;hp=cc4e46c1b00679c806d23bb2627dd586a98277da;hpb=7a523821e81e183c1e658e6d89ae77e0f0e1152e;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/linux b/lfs/linux
index cc4e46c1b..a038de08d 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .20
-VER        = 2.6.27.20
+PATCHLEVEL = .21
+VER        = 2.6.27.21
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,6 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-	mISDN-20090322.tar.gz \
 	squashfs3.4.tar.gz \
 	netfilter-layer7-v2.21.tar.gz \
 	patch-2.6.16-nath323-1.3.bz2 \
@@ -56,14 +55,12 @@ $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.21.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
 patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 squashfs3.4.tar.gz			= $(URL_IPFIRE)/squashfs3.4.tar.gz
-mISDN-20090322.tar.gz 			= $(URL_IPFIRE)/mISDN-20090322.tar.gz
 reiser4-for-2.6.27.19.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
 
-$(DL_FILE)_MD5				= 58bd12ef5348e5e44b7d7b678299ff9f
+$(DL_FILE)_MD5				= 2912af7938fae1a3f2a9a6bcf8c0009f
 netfilter-layer7-v2.21.tar.gz_MD5	= 838422e7d9a06b42e682e9064e5210b5
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
 squashfs3.4.tar.gz_MD5			= 2a4d2995ad5aa6840c95a95ffa6b1da6
-mISDN-20090322.tar.gz_MD5 		= 8495c13ef09dacf4a5e42b93da2ac3fc
 reiser4-for-2.6.27.19.patch.bz2_MD5	= 22988387f64f299489b90b484b2642cc
 
 install : $(TARGET)
@@ -101,9 +98,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Not report deprecated syscall 1.23 (for kudzu)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
     
-	# Fix crash on Twinhead H12Y notebooks
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch
-
 	# Openswan
 	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
 
@@ -131,11 +125,6 @@ ifeq "$(XEN)" ""
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-imq.patch
 endif
 
-	# mISDN
-	cd $(DIR_SRC) && rm -rf mISDN-* && mkdir mISDN-socket
-	cd $(DIR_SRC)/mISDN-socket && tar xfz $(DIR_DL)/mISDN-20090322.tar.gz
-	cd $(DIR_SRC)/mISDN-socket && yes 'yes' | ./std2kern -k /usr/src/linux
-	
 	# Cleanup kernel source
 	cd $(DIR_APP) && make mrproper
 
@@ -179,5 +168,10 @@ endif
 	mv /lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd_mod.ko \
 	    /lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd.ko
 
-	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
+	# Remove mISDN modules
+	@rm -rf /lib/modules/$(VER)-ipfire/kernel/drivers/isdn/mISDN
+	@rm -rf /lib/modules/$(VER)-ipfire/kernel/drivers/isdn/hardware/mISDN
+
+	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
 	@$(POSTBUILD)
+