X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux;h=940b36bbb3be0a068eb59be9656755558d10727e;hb=ec238128df8a41644501c9620c03103e93c89afd;hp=d01a04687c497e7ecacbae7334a60dd58de8ab1c;hpb=cfa86dfd17a94b85b2b7a6c45f2dd0d884ba9b53;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/linux b/lfs/linux
index d01a04687c..940b36bbb3 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 = .28
-VER        = 2.6.32.28
+PATCHLEVEL = .42
+VER        = 2.6.32.42
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,7 +35,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG	   = linux-xen
-PAK_VER    = 15
+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				= 9ee6d4023f34eb055ec32f201b5f9206
+$(DL_FILE)_MD5				= f1bb2e5ff5ae8d552e6cedeaa70da25e
 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]"; \
@@ -208,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)