Add Xen Patches for 2.6.32.8 and enabled build.

[people/pmueller/ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index 82a5cb4a6b519832c348c834ec7223ce5f4e8ad3..6d2465a44d04e3a064e51f96497cae93cfe87289 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -57,21 +57,21 @@ objects =$(DL_FILE) \
        patch-2.6.16-nath323-1.3.bz2 \
        reiser4-for-2.6.32.patch.bz2 \
        squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \
-#      linux-$(VER)-suse_xen_patches-1.tar.bz2
+       linux-$(VER)-suse_xen_patches-1.tar.bz2
 
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.22.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.21.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
 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2
-#linux-$(VER)-suse_xen_patches-1.tar.bz2       = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
+linux-$(VER)-suse_xen_patches-1.tar.bz2        = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
 
 $(DL_FILE)_MD5                         = 82023ede52f067fcc55c5e70b02e48ae
 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
 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4
-#linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = ddbde50f3bc303d947531402017a3055
+linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = 0bf813cbfef22f37e5060daa7dad0496
 
 install : $(TARGET)
 
@@ -117,9 +117,11 @@ ifeq "$(XEN)" "1"
                done
        rm -rf $(DIR_SRC)/linux-*-suse_xen_patches
 
+       # Fix strange patchset errors
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-patch-fixes.patch
+
        # Linux Intermediate Queueing Device
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq-skbuff.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3-xen.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch
 else
        # Linux Intermediate Queueing Device
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
@@ -131,10 +133,8 @@ 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
 
-ifeq "$(XEN)" ""
-       # Reiser4
-       cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
-endif
+       # 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
 
        # ipp2p 0.8.2-pomng
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch