X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux2;h=e8ab5eff19ba1e7d172a1b426185d799b442db31;hp=7f8b76b3e20aca827cefe238126d6156c3efa396;hb=6817e57ae4b05ae0ca99c1e7cdf14673f1f11bbd;hpb=79117dc15f51f12163f061e222bb02d77fa9b06d diff --git a/lfs/linux2 b/lfs/linux2 index 7f8b76b3e..e8ab5eff1 100644 --- a/lfs/linux2 +++ b/lfs/linux2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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" @@ -82,7 +82,7 @@ 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-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 @@ -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