From 19f2e8ea5816a809ad7cf6ce38b39421a7e511a9 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Wed, 17 Jul 2019 18:40:15 -0400 Subject: [PATCH] LU-12561 kernel: Remove RHEL6 series and targets Remove the RHEL6 series and target files. Also remove the RHEL5 (wow!) targets, and the outdated Fedora (fc) targets. Test-Parameters: trivial Signed-off-by: Patrick Farrell Change-Id: I00fc47cac656bc3b6f220f3994f0a25ed73879f9 Reviewed-on: https://review.whamcloud.com/35545 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Andreas Dilger --- lustre/autoconf/lustre-core.m4 | 9 -------- lustre/kernel_patches/series/2.6-rhel6.8.series | 10 --------- lustre/kernel_patches/series/2.6-rhel6.series | 9 -------- lustre/kernel_patches/targets/2.6-fc11.target.in | 15 ------------- lustre/kernel_patches/targets/2.6-fc12.target.in | 14 ------------ lustre/kernel_patches/targets/2.6-fc15.target.in | 14 ------------ lustre/kernel_patches/targets/2.6-rhel5.target.in | 25 --------------------- .../kernel_patches/targets/2.6-rhel6.6.target.in | 26 ---------------------- .../kernel_patches/targets/2.6-rhel6.7.target.in | 26 ---------------------- .../kernel_patches/targets/2.6-rhel6.8.target.in | 26 ---------------------- .../kernel_patches/targets/2.6-rhel6.9.target.in | 26 ---------------------- lustre/kernel_patches/targets/2.6-rhel6.target.in | 26 ---------------------- 12 files changed, 226 deletions(-) delete mode 100644 lustre/kernel_patches/series/2.6-rhel6.8.series delete mode 100644 lustre/kernel_patches/series/2.6-rhel6.series delete mode 100644 lustre/kernel_patches/targets/2.6-fc11.target.in delete mode 100644 lustre/kernel_patches/targets/2.6-fc12.target.in delete mode 100644 lustre/kernel_patches/targets/2.6-fc15.target.in delete mode 100644 lustre/kernel_patches/targets/2.6-rhel5.target.in delete mode 100644 lustre/kernel_patches/targets/2.6-rhel6.6.target.in delete mode 100644 lustre/kernel_patches/targets/2.6-rhel6.7.target.in delete mode 100644 lustre/kernel_patches/targets/2.6-rhel6.8.target.in delete mode 100644 lustre/kernel_patches/targets/2.6-rhel6.9.target.in delete mode 100644 lustre/kernel_patches/targets/2.6-rhel6.target.in diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 2242af4..5d1f52f 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3766,12 +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-rhel6.9.target -lustre/kernel_patches/targets/2.6-rhel6.8.target -lustre/kernel_patches/targets/2.6-rhel6.7.target -lustre/kernel_patches/targets/2.6-rhel6.6.target -lustre/kernel_patches/targets/2.6-rhel6.target -lustre/kernel_patches/targets/2.6-rhel5.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 @@ -3780,9 +3774,6 @@ lustre/kernel_patches/targets/3.12-sles12.target lustre/kernel_patches/targets/4.4-sles12.target lustre/kernel_patches/targets/4.4-sles12sp3.target lustre/kernel_patches/targets/4.12-sles12sp4.target -lustre/kernel_patches/targets/2.6-fc11.target -lustre/kernel_patches/targets/2.6-fc12.target -lustre/kernel_patches/targets/2.6-fc15.target lustre/kernel_patches/targets/3.x-fc18.target lustre/ldlm/Makefile lustre/fid/Makefile diff --git a/lustre/kernel_patches/series/2.6-rhel6.8.series b/lustre/kernel_patches/series/2.6-rhel6.8.series deleted file mode 100644 index ece4099..0000000 --- a/lustre/kernel_patches/series/2.6-rhel6.8.series +++ /dev/null @@ -1,10 +0,0 @@ -mpt-fusion-max-sge-rhel6.patch -raid5-mmp-unplug-dev-rhel6.patch -dev_read_only-2.6.32-rhel6.patch -blkdev_tunables-2.6-rhel6.patch -bh_lru_size_increase.patch -quota-replace-dqptr-sem-el6.8.patch -quota-avoid-dqget-calls.patch -jbd2-log_wait_for_space-2.6-rhel6.patch -module-load-deadlock-rhel6.patch -kallsyms-rhel6.patch diff --git a/lustre/kernel_patches/series/2.6-rhel6.series b/lustre/kernel_patches/series/2.6-rhel6.series deleted file mode 100644 index 0fab6ac..0000000 --- a/lustre/kernel_patches/series/2.6-rhel6.series +++ /dev/null @@ -1,9 +0,0 @@ -mpt-fusion-max-sge-rhel6.patch -raid5-mmp-unplug-dev-rhel6.patch -dev_read_only-2.6.32-rhel6.patch -blkdev_tunables-2.6-rhel6.patch -bh_lru_size_increase.patch -quota-replace-dqptr-sem.patch -quota-avoid-dqget-calls.patch -jbd2-log_wait_for_space-2.6-rhel6.patch -module-load-deadlock-rhel6.patch diff --git a/lustre/kernel_patches/targets/2.6-fc11.target.in b/lustre/kernel_patches/targets/2.6-fc11.target.in deleted file mode 100644 index dc9eefb..0000000 --- a/lustre/kernel_patches/targets/2.6-fc11.target.in +++ /dev/null @@ -1,15 +0,0 @@ -lnxmaj="2.6.29.4" -lnxrel="167.fc11" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES="" -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ -BASE_ARCHS="i686 x86_64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -SMP_ARCHS="" -UP_ARCHS="" - - diff --git a/lustre/kernel_patches/targets/2.6-fc12.target.in b/lustre/kernel_patches/targets/2.6-fc12.target.in deleted file mode 100644 index 5c0c575..0000000 --- a/lustre/kernel_patches/targets/2.6-fc12.target.in +++ /dev/null @@ -1,14 +0,0 @@ -lnxmaj="2.6.31.5" -lnxrel="127.fc12" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES="" -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ -BASE_ARCHS="i686 x86_64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -SMP_ARCHS="" -UP_ARCHS="" - diff --git a/lustre/kernel_patches/targets/2.6-fc15.target.in b/lustre/kernel_patches/targets/2.6-fc15.target.in deleted file mode 100644 index d560a46..0000000 --- a/lustre/kernel_patches/targets/2.6-fc15.target.in +++ /dev/null @@ -1,14 +0,0 @@ -lnxmaj="2.6.38.6" -lnxrel="26.rc1.fc15" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES="" -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ -BASE_ARCHS="i686 x86_64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -SMP_ARCHS="" -UP_ARCHS="" - diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in deleted file mode 100644 index b55054a..0000000 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ /dev/null @@ -1,25 +0,0 @@ -lnxmaj="2.6.18" -lnxrel="348.3.1.el5" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES=2.6-rhel5.series -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ - -OFED_VERSION=inkernel - -BASE_ARCHS="i686 x86_64 ia64 ppc64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -#SMP_ARCHS="i686 x86_64 ia64 ppc64" -# RHEL5 doesn't use smp specific kernels -SMP_ARCHS="" -UP_ARCHS="" - -for cc in gcc ; do - if which $cc >/dev/null 2>/dev/null ; then - export CC=$cc - break - fi -done diff --git a/lustre/kernel_patches/targets/2.6-rhel6.6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.6.target.in deleted file mode 100644 index 131ecb1..0000000 --- a/lustre/kernel_patches/targets/2.6-rhel6.6.target.in +++ /dev/null @@ -1,26 +0,0 @@ -lnxmaj="2.6.32" -lnxrel="504.30.3.el6" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES=2.6-rhel6.series -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ - -DEVEL_PATH_ARCH_DELIMETER="." -OFED_VERSION=inkernel - -BASE_ARCHS="i686 x86_64 ia64 ppc64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -#SMP_ARCHS="i686 x86_64 ia64 ppc64" -# RHEL5 doesn't use smp specific kernels -SMP_ARCHS="" -UP_ARCHS="" - -for cc in gcc ; do - if which $cc >/dev/null 2>/dev/null ; then - export CC=$cc - break - fi -done diff --git a/lustre/kernel_patches/targets/2.6-rhel6.7.target.in b/lustre/kernel_patches/targets/2.6-rhel6.7.target.in deleted file mode 100644 index 8313d51..0000000 --- a/lustre/kernel_patches/targets/2.6-rhel6.7.target.in +++ /dev/null @@ -1,26 +0,0 @@ -lnxmaj="2.6.32" -lnxrel="573.26.1.el6" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES=2.6-rhel6.series -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ - -DEVEL_PATH_ARCH_DELIMETER="." -OFED_VERSION=inkernel - -BASE_ARCHS="i686 x86_64 ia64 ppc64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -#SMP_ARCHS="i686 x86_64 ia64 ppc64" -# RHEL5 doesn't use smp specific kernels -SMP_ARCHS="" -UP_ARCHS="" - -for cc in gcc ; do - if which $cc >/dev/null 2>/dev/null ; then - export CC=$cc - break - fi -done diff --git a/lustre/kernel_patches/targets/2.6-rhel6.8.target.in b/lustre/kernel_patches/targets/2.6-rhel6.8.target.in deleted file mode 100644 index 8a9c396..0000000 --- a/lustre/kernel_patches/targets/2.6-rhel6.8.target.in +++ /dev/null @@ -1,26 +0,0 @@ -lnxmaj="2.6.32" -lnxrel="642.15.1.el6" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES=2.6-rhel6.8.series -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ - -DEVEL_PATH_ARCH_DELIMETER="." -OFED_VERSION=inkernel - -BASE_ARCHS="i686 x86_64 ia64 ppc64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -#SMP_ARCHS="i686 x86_64 ia64 ppc64" -# RHEL5 doesn't use smp specific kernels -SMP_ARCHS="" -UP_ARCHS="" - -for cc in gcc ; do - if which $cc >/dev/null 2>/dev/null ; then - export CC=$cc - break - fi -done diff --git a/lustre/kernel_patches/targets/2.6-rhel6.9.target.in b/lustre/kernel_patches/targets/2.6-rhel6.9.target.in deleted file mode 100644 index 86497ae..0000000 --- a/lustre/kernel_patches/targets/2.6-rhel6.9.target.in +++ /dev/null @@ -1,26 +0,0 @@ -lnxmaj="2.6.32" -lnxrel="696.18.7.el6" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES=2.6-rhel6.8.series -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ - -DEVEL_PATH_ARCH_DELIMETER="." -OFED_VERSION=inkernel - -BASE_ARCHS="i686 x86_64 ia64 ppc64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -#SMP_ARCHS="i686 x86_64 ia64 ppc64" -# RHEL5 doesn't use smp specific kernels -SMP_ARCHS="" -UP_ARCHS="" - -for cc in gcc ; do - if which $cc >/dev/null 2>/dev/null ; then - export CC=$cc - break - fi -done diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in deleted file mode 100644 index aa1e7d3..0000000 --- a/lustre/kernel_patches/targets/2.6-rhel6.target.in +++ /dev/null @@ -1,26 +0,0 @@ -lnxmaj="2.6.32" -lnxrel="431.29.2.el6" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES=2.6-rhel6.series -EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ -LUSTRE_VERSION=@VERSION@ - -DEVEL_PATH_ARCH_DELIMETER="." -OFED_VERSION=inkernel - -BASE_ARCHS="i686 x86_64 ia64 ppc64" -BIGMEM_ARCHS="" -BOOT_ARCHS="" -JENSEN_ARCHS="" -#SMP_ARCHS="i686 x86_64 ia64 ppc64" -# RHEL5 doesn't use smp specific kernels -SMP_ARCHS="" -UP_ARCHS="" - -for cc in gcc ; do - if which $cc >/dev/null 2>/dev/null ; then - export CC=$cc - break - fi -done -- 1.8.3.1