From 872308001bf43ae3f190ceea11850f2f4eb8b7b3 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 22 Aug 2022 18:37:06 -0700 Subject: [PATCH] LU-16075 kernel: kernel update RHEL8.6 [4.18.0-372.19.1.el8_6] Update RHEL8.6 kernel to 4.18.0-372.19.1.el8_6. Test-Parameters: trivial fstype=ldiskfs \ clientdistro=el8.6 serverdistro=el8.6 testlist=sanity Test-Parameters: trivial fstype=zfs \ clientdistro=el8.6 serverdistro=el8.6 testlist=sanity Change-Id: I8e0fbdab54d36512c4c4cbdbc97c580994ebcbd3 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/48116 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 5 +++++ lustre/ChangeLog | 4 ++-- lustre/kernel_patches/targets/4.18-rhel8.6.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 3f3ae98..eee667e 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -466,6 +466,8 @@ download_srpm() { local srpm=$2 local force="${3:-false}" + [[ ! -s "$KERNELDIR/$srpm" ]] || return 0 + # let the download_file handle the concurrency if $DOWNLOAD; then local location @@ -490,6 +492,9 @@ download_debuginfo_common() { local rpm=$1 local force="${2:-false}" + [[ ! -s "$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH/$rpm" ]] || + return 0 + # let the download_file handle the concurrency if $DOWNLOAD; then # get the location from a distro specific method if it exists diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 1be16d9..e9a7df7 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -3,7 +3,7 @@ TBD Whamcloud * See https://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix for currently supported client and server kernel versions. * Server primary kernels built and tested during release cycle: - 4.18.0-372.16.1.el8 (RHEL8.6) + 4.18.0-372.19.1.el8 (RHEL8.6) * Other server kernels known to build and work at some point (others may also work): 3.10.0-862.14.4.el7 (RHEL7.5) 3.10.0-957.27.2.el7 (RHEL7.6) @@ -27,7 +27,7 @@ TBD Whamcloud * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not * Client primary kernels built and tested during release cycle: 5.14.0-70.22.1.el9 (RHEL9.0) - 4.18.0-372.16.1.el8 (RHEL8.6) + 4.18.0-372.19.1.el8 (RHEL8.6) 5.4.0-37 (Ubuntu 20.04) 5.14.21-150400.24.18 (SLES15 SP4) * Other clients known to build on these kernels at some point (others may also work): diff --git a/lustre/kernel_patches/targets/4.18-rhel8.6.target.in b/lustre/kernel_patches/targets/4.18-rhel8.6.target.in index 5e1eb5f..f0bba47 100644 --- a/lustre/kernel_patches/targets/4.18-rhel8.6.target.in +++ b/lustre/kernel_patches/targets/4.18-rhel8.6.target.in @@ -1,5 +1,5 @@ lnxmaj="4.18.0" -lnxrel="372.16.1.el8_6" +lnxrel="372.19.1.el8_6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=4.18-rhel8.6.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index c0419ea..78bb6a9 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -23,6 +23,6 @@ PATCH SERIES FOR SERVER KERNELS: 4.18-rhel8.3.series 4.18.0-240.22.1.el8 (RHEL 8.3) 4.18-rhel8.4.series 4.18.0-305.25.1.el8 (RHEL 8.4) 4.18-rhel8.5.series 4.18.0-348.23.1.el8 (RHEL 8.5) -4.18-rhel8.6.series 4.18.0-372.16.1.el8 (RHEL 8.6) +4.18-rhel8.6.series 4.18.0-372.19.1.el8 (RHEL 8.6) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1