From cf221140d5050794d375bc40c12db8ea9a40808d Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 17 Feb 2023 16:17:15 +0000 Subject: [PATCH] LU-16221 revert: new kernel [RHEL 9.1 5.14.0-162.12.1.el9_1] This reverts commit a7a6107dbe17be5a5f416bd2366b8bf75f6506e6. This inadvertently triggered el9.1 to be built for all patches, but the el9.1 support is not fully landed yet. Change-Id: Ic51d0e65af9b2e57814738872fbb48a04db33738 Test-Parameters: trivial Signed-off-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/50043 --- contrib/lbuild/funcs.sh | 1 - lustre/ChangeLog | 1 - lustre/autoconf/lustre-core.m4 | 1 - .../kernel_patches/targets/5.14-rhel9.1.target.in | 26 ---------------------- 4 files changed, 29 deletions(-) delete mode 100644 lustre/kernel_patches/targets/5.14-rhel9.1.target.in diff --git a/contrib/lbuild/funcs.sh b/contrib/lbuild/funcs.sh index 3c4f58b..f448e03 100644 --- a/contrib/lbuild/funcs.sh +++ b/contrib/lbuild/funcs.sh @@ -193,7 +193,6 @@ autodetect_target() { rhel7*) target="3.10-rhel7";; rhel8*) target="4.18-rhel8";; rhel-9.0) target="5.14-rhel9.0";; - rhel-9.1) target="5.14-rhel9.1";; sles11.4) target="$(uname -r | cut -d . -f 1,2)-sles11sp4";; sles11.3) target="$(uname -r | cut -d . -f 1,2)-sles11sp3";; sles11*) target="$(uname -r | cut -d . -f 1,2)-sles11";; diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 9013c11..9a91d4d 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -44,7 +44,6 @@ 4.18.0-372.32.1.el8 (RHEL8.6) 4.18.0-425.10.1.el8 (RHEL8.7) 5.14.0-70.30.1.el9 (RHEL9.0) - 5.14.0-162.12.1.el9 (RHEL9.1) 4.4.120-92.70 (SLES12 SP2) 4.4.180-94.100 (SLES12 SP3) 4.4.0-131 (Ubuntu 16.04) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index d7c3711..c123787 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3370,7 +3370,6 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile -lustre/kernel_patches/targets/5.14-rhel9.1.target lustre/kernel_patches/targets/5.14-rhel9.0.target lustre/kernel_patches/targets/4.18-rhel8.7.target lustre/kernel_patches/targets/4.18-rhel8.6.target diff --git a/lustre/kernel_patches/targets/5.14-rhel9.1.target.in b/lustre/kernel_patches/targets/5.14-rhel9.1.target.in deleted file mode 100644 index 2b60a69..0000000 --- a/lustre/kernel_patches/targets/5.14-rhel9.1.target.in +++ /dev/null @@ -1,26 +0,0 @@ -lnxmaj="5.14.0" -lnxrel="162.12.1.el9_1" - -KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -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" -# RHEL8 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