X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux;h=c39fb74d093bcaba0e05244f69631a6f58f7714d;hb=952bb3b8d0e932ade22a17fa52b9ef8d8deecd59;hp=303d62cc71d6933a9dd30b82f3d444c4010c982e;hpb=933377600e8230e688cd760d031af538c2f4c8bf;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/linux b/lfs/linux
index 303d62cc7..c39fb74d0 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .25
-VER        = 2.6.32.25
+PATCHLEVEL = .43
+VER        = 2.6.32.43
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,7 +35,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG	   = linux-xen
-PAK_VER    = 12
+PAK_VER    = 16
 DEPS	   = ""
 
 # Normal build or XEN build.
@@ -60,19 +60,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 \
-	xen-patches-2.6.32-2d.tar.bz2
+	xen-patches-2.6.32-2f.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
-xen-patches-2.6.32-2d.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2
+xen-patches-2.6.32-2f.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
 
-$(DL_FILE)_MD5				= 0d6ad4e7e387f56c5b5831beb97c0c1f
+$(DL_FILE)_MD5				= d6819da012da0d9772ac79da9dce3d63
 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
-xen-patches-2.6.32-2d.tar.bz2_MD5	= d1690d2b8b0c9124897981aea505f8f7
+xen-patches-2.6.32-2f.tar.bz2_MD5	= b59d6f89e11accb9d40354418e13f31b
 
 install : $(TARGET)
 
@@ -110,7 +110,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-2d.tar.bz2
+	cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
 
 	for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
 		echo "*********** [Patch: $$x]"; \
@@ -145,6 +145,14 @@ endif
 	# 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
 
+	# Fix uevent PHYSDEVDRIVER
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
+
+	# Install ipfire logo
+	cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/kernel/ipfire_logo.ppm \
+		drivers/video/logo/logo_linux_clut224.ppm
+
 	# Cleanup kernel source
 
 	cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
@@ -189,6 +197,10 @@ ifneq "$(XEN)" "1"
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
 	done
 	sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
+
+	# Disable ipv6 at runtime
+	echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6
+
 endif
 endif
 
@@ -196,5 +208,9 @@ endif
 	rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
 	rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
 
+	# Disable geode_aes modul
+	mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
+           /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off
+
 	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
 	@$(POSTBUILD)