X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux;h=5d27158f06662b5ce454d3a981f58b7f13a3a210;hb=ced716a1be295c06db1cde529c37ba043f23dc16;hp=55c994b52cd8b0ea993e7957d49744d26895b162;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/linux b/lfs/linux
index 55c994b52c..5d27158f06 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .53
-VER        = 2.6.16.53
+PATCHLEVEL = .15
+VER        = 2.6.32.15
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,44 +34,44 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-# Normal build or SMP build.
+PROG	   = linux-xen
+PAK_VER    = 10
+DEPS	   = ""
+
+# Normal build or XEN build.
 #
-ifeq "$(SMP)" "1"
-	TARGET = $(DIR_INFO)/linux-$(VER)-smp
+
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
 else
-	TARGET = $(DIR_INFO)/linux-$(VER)
+	VERSUFIX=ipfire
 endif
 
+TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-	mISDN-1_1_5.tar.gz \
-	squashfs3.2-r2.tar.gz \
-	iptables-1.3.5.tar.bz2 \
-	patch-o-matic-ng-20061210.tar.bz2 \
-	netfilter-layer7-v2.9.tar.gz \
+	netfilter-layer7-v2.22.tar.gz \
 	patch-2.6.16-nath323-1.3.bz2 \
-	openswan-2.4.9.tar.gz
-
-$(DL_FILE)												= $(URL_IPFIRE)/$(DL_FILE)
-patch-o-matic-ng-20061210.tar.bz2	= $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
-iptables-1.3.5.tar.bz2						= $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
-netfilter-layer7-v2.9.tar.gz			= $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
-patch-2.6.16-nath323-1.3.bz2			= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
-squashfs3.2-r2.tar.gz							= $(URL_IPFIRE)/squashfs3.2-r2.tar.gz
-mISDN-1_1_5.tar.gz                = $(URL_IPFIRE)/mISDN-1_1_5.tar.gz
-openswan-2.4.9.tar.gz							= $(URL_IPFIRE)/openswan-2.4.9.tar.gz
-
-$(DL_FILE)_MD5										= 5c6e965d9121ba0d3f3c747e519de402
-patch-o-matic-ng-20061210.tar.bz2_MD5	= 76edac76301b45f89e467b41c8cf4393
-iptables-1.3.5.tar.bz2_MD5				= 00fb916fa8040ca992a5ace56d905ea5
-netfilter-layer7-v2.9.tar.gz_MD5	= ebf9043a5352ebe6dbd721989ef83dee
+	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
+
+$(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
+
+$(DL_FILE)_MD5				= 1cbbf16e93bbe03368172872690600c0
+netfilter-layer7-v2.22.tar.gz_MD5	= 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
-squashfs3.2-r2.tar.gz_MD5					= bf360b92eba9e6d5610196ce2e02fcd1
-mISDN-1_1_5.tar.gz_MD5	          = 93b1cff7817b82638a0475c2b7b7f1b6
-openswan-2.4.9.tar.gz_MD5					= 845f12d80d443cfa1a52f2b53b987bee
+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
 
 install : $(TARGET)
 
@@ -81,6 +81,8 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist:
+	@$(PAK)
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -100,107 +102,110 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
 	ln -s linux-$(VER) /usr/src/linux
 
-	# An UTF8 patch from LFS
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16.27-utf8_input-1.patch
-
-	# Openswan 2
-	cd $(DIR_SRC) && rm -rf openswan-*
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.9.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.9.kernel-2.6-klips.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.9.kernel-2.6-natt.patch
-
-	cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
-
-	# H323 conntrack
-	cd $(DIR_APP) && bunzip2 -cd $(DIR_DL)/patch-2.6.16-nath323-1.3.bz2 | patch -Np1
-
-	# Reiser4
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.16-5.patch
-
-	# SquashFS
-	cd $(DIR_SRC) && rm -rf squashfs*
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.2-r2.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.2-r2/kernel-patches/linux-2.6.16/squashfs3.2-patch
-
-	# ip_conntrack permissions from 440 to 444
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
-	
-	# Some VIA patches
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/padlock-prereq-2.6.16.diff
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/epia_dma.patch
-
-	# Patch-o-matic
-	cd $(DIR_SRC) && rm -rf iptables-* patch-o-matic*
-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
-	cd $(DIR_SRC) && ln -sf iptables-1.3.5 iptables
-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/patch-o-matic-ng-20061210.tar.bz2
-	cd $(DIR_SRC)/patch-o-matic-ng* && \
-		./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ \
-			--iptables-path=$(ROOT)/usr/src/iptables/ \
-			sip-conntrack-nat rtsp-conntrack-nat \
-			mms-conntrack-nat
+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
 
-	# Layer7-patch
-	cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.9
-	cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.9.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.9/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch
+	for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
+		echo "*********** [Patch: $$x]"; \
+		cd $(DIR_APP) && pwd && patch -Np1 < $$x || exit 1; \
+	done
+	rm -rf $(DIR_SRC)/xen-patches
 
 	# Linux Intermediate Queueing Device
-ifeq "$(XEN)" ""
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16-imq2.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch
+else
+	# Linux Intermediate Queueing Device
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
 endif
 
-	# mISDN
-	cd $(DIR_SRC) && rm -rf mISDN-*
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_5.tar.gz
-	cd $(DIR_SRC)/mISDN-1_1_5 && yes 'yes' | ./std2kern -k /usr/src/linux
-	
-	cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch
+	# 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
 
-ifeq "$(SMP)" ""
-	# Only do this once on the non-SMP pass
-	cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.5
-endif
+	# Reiser4 (don't check if fail (some patches are already in xen patchset)
+	-cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
 
-	# Cleanup kernel source
-	cd $(DIR_APP) && make mrproper
+	# ipp2p 0.8.2-pomng
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
 
-ifeq "$(SMP)" "1"
-	cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).smp $(DIR_APP)/.config
-else
-	cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config
-endif
+	# Layer7-patch
+	cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.22
+	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
+
+	# 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
+
+	cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
 	cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
 	cd $(DIR_APP) && make CC="$(KGCC)" clean
+	cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
 
-ifeq "$(SMP)" "1"
-	cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire-smp/' Makefile
-	cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
-	cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire-smp
-	cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-smp
-	ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
-	cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
-	cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
+ifeq "$(XEN)" "1"
+	cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
+	cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX)
 else
-	cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
 	cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
-	cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire
-	cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire
-	cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
-	ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz-ipfire
-	ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
+	cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+endif
+	cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
+	cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
+	ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
+	ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX)
 	cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
 	cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
-endif
+	cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
 
-ifeq "$(SMP)" ""
-	# Only do this once on the non-SMP pass	
+ifeq "$(XEN)" ""
+	# Only do this once on the non-XEN pass
 	cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
-endif 
+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
+
+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 ; \
+	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)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
+	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
 	@$(POSTBUILD)