From 985785c3df095f6b33e2ad9f3bdd82f044726988 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 27 Oct 2020 15:52:32 -0700 Subject: [PATCH] LU-13961 kernel: kernel update RHEL8.2 [4.18.0-193.19.1.el8_2] Update RHEL8.2 kernel to 4.18.0-193.19.1.el8_2. Test-Parameters: trivial \ clientdistro=el8.2 serverdistro=el8.2 \ testlist=sanity Change-Id: I32d65790adcd5829cdc4447e9b116a83bf1efd63 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/39987 Reviewed-by: Minh Diep Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild-rhel8 | 13 +++++++++---- lustre/ChangeLog | 4 ++-- lustre/kernel_patches/targets/4.18-rhel8.2.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/contrib/lbuild/lbuild-rhel8 b/contrib/lbuild/lbuild-rhel8 index 6963f58..f042084 100644 --- a/contrib/lbuild/lbuild-rhel8 +++ b/contrib/lbuild/lbuild-rhel8 @@ -108,15 +108,20 @@ find_linux_rpm-rhel8() { } kernel_srpm_location() { + local kdir - echo "http://vault.centos.org/8.1.1911/BaseOS/Source/SPackages/" + case $lnxrel in + *8_2) kdir="8.2.2004" ;; + *8_1) kdir="8.1.1911" ;; + *8_0) kdir="8.0.1905" ;; + *) ;; + esac + echo "http://vault.centos.org/$kdir/BaseOS/Source/SPackages/" } kernel_debuginfo_location() { - - echo "http://debuginfo.centos.org/8/x86_64/" - + echo "http://debuginfo.centos.org/8/x86_64/Packages/" } cleanup_rpmmacros() { diff --git a/lustre/ChangeLog b/lustre/ChangeLog index e90e1e3..a1d33bd 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -11,7 +11,7 @@ TBD Whamcloud 3.10.0-957.27.2.el7 (RHEL7.6) 4.18.0-80.11.2.el8 (RHEL8.0) 4.18.0-147.8.1.el8 (RHEL8.1) - 4.18.0-193.6.3.el8 (RHEL8.2) + 4.18.0-193.19.1.el8 (RHEL8.2) 4.4.120-92.70 (SLES12 SP2) 4.4.180-94.100 (SLES12 SP3) 4.4.0-131 (Ubuntu 16.04) @@ -34,7 +34,7 @@ TBD Whamcloud 4.14.0-115.2.2.el7a (RHEL7.6) 4.18.0-80.11.2.el8 (RHEL8.0) 4.18.0-147.8.1.el8 (RHEL8.1) - 4.18.0-193.6.3.el8 (RHEL8.2) + 4.18.0-193.19.1.el8 (RHEL8.2) 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/kernel_patches/targets/4.18-rhel8.2.target.in b/lustre/kernel_patches/targets/4.18-rhel8.2.target.in index 1a6dc10..9efa3cc 100644 --- a/lustre/kernel_patches/targets/4.18-rhel8.2.target.in +++ b/lustre/kernel_patches/targets/4.18-rhel8.2.target.in @@ -1,5 +1,5 @@ lnxmaj="4.18.0" -lnxrel="193.6.3.el8_2" +lnxrel="193.19.1.el8_2" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=4.18-rhel8.2.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 5379ec1..a6f6227 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -19,6 +19,6 @@ PATCH SERIES FOR SERVER KERNELS: 3.10-rhel7.9.series 3.10.0-1160.2.1.el7 (RHEL 7.9) 4.18-rhel8.series 4.18.0-80.11.2.el8 (RHEL 8.0) 4.18-rhel8.1.series 4.18.0-147.8.1.el8 (RHEL 8.1) -4.18-rhel8.2.series 4.18.0-193.6.3.el8 (RHEL 8.2) +4.18-rhel8.2.series 4.18.0-193.19.1.el8 (RHEL 8.2) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1