X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux2;h=e8ab5eff19ba1e7d172a1b426185d799b442db31;hb=ad4ce45ae29bfa931ba5fb88bc99dccaccc48303;hp=f6df2b4b63bf54a6f5dbd446bb1f431b2689e657;hpb=41cfd9e04b1a06d242432e682ab5601f933c0e21;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/linux2 b/lfs/linux2
index f6df2b4b6..e8ab5eff1 100644
--- a/lfs/linux2
+++ b/lfs/linux2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2013  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 = .59
-VER        = 2.6.32.59
+PATCHLEVEL = .60
+VER        = 2.6.32.60
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 20
+PAK_VER    = 26
 DEPS	   = ""
 
 # Normal build or XEN build.
@@ -51,7 +51,7 @@ else
 	HEADERS_PREFIX = /usr
 endif
 else
-	TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
+	TARGET = $(DIR_INFO)/linux-xen-$(VER)-$(VERSUFIX)
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -74,19 +74,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-2f.tar.bz2
+	xen-patches-2.6.32-2g.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-2f.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
+xen-patches-2.6.32-2g.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2g.tar.bz2
 
-$(DL_FILE)_MD5				= 69c68c4a8eb0f04b051a7dbcff16f6d0
+$(DL_FILE)_MD5				= a8e037a78c5fabefd2baa83f7ae0b8b1
 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-2f.tar.bz2_MD5	= b59d6f89e11accb9d40354418e13f31b
+xen-patches-2.6.32-2g.tar.bz2_MD5	= d259a847c9aa73cd6e5c3605d9657d66
 
 install : $(TARGET)
 
@@ -124,7 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(KCFG)" "-xen"
 	# Apply gentoo Xen patches
 	mkdir -p $(DIR_SRC)/xen-patches
-	cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
+	cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2g.tar.bz2
 
 	for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
 		echo "*********** [Patch: $$x]"; \
@@ -139,9 +139,6 @@ else
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
 endif
 
-	# 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
-
 	# 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