From 2bf41f6e510933c422aeec6e2587a894a4876ee4 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Wed, 17 Jul 2019 18:45:14 -0400 Subject: [PATCH] LU-12561 kernel: Remove 2.6 based SLES11 support 2.6 based SLES11 (SLES11SP{0,1,2}) is no longer supported (and does not build) so remove the series & target for it. 3.x based SLES11 (SP{3,4}) is still supported, and this should not affect those. Test-Parameters: trivial Signed-off-by: Patrick Farrell Change-Id: Ie73c39d24bad26e696a66e907c161348ab4afad5 Reviewed-on: https://review.whamcloud.com/35546 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/autoconf/lustre-core.m4 | 1 - lustre/kernel_patches/series/2.6-sles11.series | 5 --- lustre/kernel_patches/targets/2.6-sles11.target.in | 37 ---------------------- 3 files changed, 43 deletions(-) delete mode 100644 lustre/kernel_patches/series/2.6-sles11.series delete mode 100644 lustre/kernel_patches/targets/2.6-sles11.target.in diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 5d1f52f..5ef17a3 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3766,7 +3766,6 @@ lustre/kernel_patches/targets/3.10-rhel7.6.target lustre/kernel_patches/targets/3.10-rhel7.5.target lustre/kernel_patches/targets/4.14-rhel7.5.target lustre/kernel_patches/targets/4.14-rhel7.6.target -lustre/kernel_patches/targets/2.6-sles11.target lustre/kernel_patches/targets/3.0-sles11.target lustre/kernel_patches/targets/3.0-sles11sp3.target lustre/kernel_patches/targets/3.0-sles11sp4.target diff --git a/lustre/kernel_patches/series/2.6-sles11.series b/lustre/kernel_patches/series/2.6-sles11.series deleted file mode 100644 index ef74284..0000000 --- a/lustre/kernel_patches/series/2.6-sles11.series +++ /dev/null @@ -1,5 +0,0 @@ -raid5-mmp-unplug-dev-sles11sp1.patch -dev_read_only-2.6.32-sles11.patch -bh_lru_size_increase.patch -quota-replace-dqptr-sem-sles11.patch -quota-avoid-dqget-calls.patch diff --git a/lustre/kernel_patches/targets/2.6-sles11.target.in b/lustre/kernel_patches/targets/2.6-sles11.target.in deleted file mode 100644 index 85e8606..0000000 --- a/lustre/kernel_patches/targets/2.6-sles11.target.in +++ /dev/null @@ -1,37 +0,0 @@ -lnxmaj="2.6.32" -lnxmin=".36" -lnxrel="0.5" -# use this when there is an "RPM fix" which means that the name of the -# (source) RPM has been updated but the version of the kernel inside the -# RPM is not also updated -rpmfix=".2" - -# this is the delimeter that goes before the "smp" at the end of the version -# defaults to empty -FLAVOR_DELIMITER="-" - -KERNEL_SRPM=kernel-source-${lnxmaj}${lnxmin}-${lnxrel}${rpmfix}.src.rpm -SERIES=2.6-sles11.series -VERSION=$lnxmaj -EXTRA_VERSION="${lnxmin#.}-${lnxrel}_lustre.@VERSION@" -LUSTRE_VERSION=@VERSION@ - -OFED_VERSION=inkernel - -BASE_ARCHS="i686 ppc x86_64 ia64 ppc64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -DEFAULT_ARCHS="i686 x86_64 ia64 ppc64" -BIGSMP_ARCHS="" -PSERIES64_ARCHS="ppc" -UP_ARCHS="" -SRC_ARCHS="" -#RPMSMPTYPE="smp" - -for cc in gcc ; do - if which $cc >/dev/null 2>/dev/null ; then - export CC=$cc - break - fi -done -- 1.8.3.1