Merge remote-tracking branch 'origin/next' into thirteen

[ipfire-2.x.git] / lfs / linux2

diff --git a/lfs/linux2 b/lfs/linux2
index f6df2b4b63bf54a6f5dbd446bb1f431b2689e657..9bedd535d5d1268a005aa7686a99f7e2d5d46f85 100644 (file)
--- a/lfs/linux2
+++ b/lfs/linux2
@@ -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    = 21
 DEPS      = ""
 
 # Normal build or XEN build.
@@ -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]"; \