LU-15008 kernel: kernel update RHEL8.4 [4.18.0-305.19.1.el8_4]

Update RHEL8.4 kernel to 4.18.0-305.19.1.el8_4.

Test-Parameters: trivial fstype=ldiskfs \
clientdistro=el8.4 serverdistro=el8.4 testlist=sanity

Test-Parameters: trivial fstype=zfs \
clientdistro=el8.4 serverdistro=el8.4 testlist=sanity

Change-Id: Icedc6cf2a5678cfbce76c47507137c0ea41d0b06
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/44950
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index fdcb944..72a9e91 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -13,7 +13,7 @@ TBD Whamcloud
          4.18.0-147.8.1.el8   (RHEL8.1)
          4.18.0-193.28.1.el8  (RHEL8.2)
          4.18.0-240.22.1.el8  (RHEL8.3)
-         4.18.0-305.3.1.el8   (RHEL8.4)
+         4.18.0-305.19.1.el8  (RHEL8.4)
          4.4.120-92.70        (SLES12 SP2)
          4.4.180-94.100       (SLES12 SP3)
          4.4.0-131            (Ubuntu 16.04)
@@ -42,7 +42,7 @@ TBD Whamcloud
          4.18.0-147.8.1.el8   (RHEL8.1)
          4.18.0-193.28.1.el8  (RHEL8.2)
          4.18.0-240.22.1.el8  (RHEL8.3)
-         4.18.0-305.3.1.el8   (RHEL8.4)
+         4.18.0-305.19.1.el8  (RHEL8.4)
          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.4.target.in b/lustre/kernel_patches/targets/4.18-rhel8.4.target.in
index 002723c..e81a598 100644 (file)
--- a/lustre/kernel_patches/targets/4.18-rhel8.4.target.in
+++ b/lustre/kernel_patches/targets/4.18-rhel8.4.target.in
@@ -1,11 +1,7 @@
 lnxmaj="4.18.0"
-lnxrel="305.3.1.el8_4"
-# In https://vault.centos.org/8.4.2105/BaseOS/Source/SPackages/,
-# the kernel src rpm is suffixed with el8.src.rpm instead of
-# el8_4.src.rpm.
-lnxrel_el8="305.3.1.el8"
+lnxrel="305.19.1.el8_4"
 
-KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel_el8}.src.rpm
+KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=4.18-rhel8.4.series
 EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
 LUSTRE_VERSION=@VERSION@

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 4761c1a..d33d4c4 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -21,6 +21,6 @@ PATCH SERIES FOR SERVER KERNELS:
 4.18-rhel8.1.series     4.18.0-147.8.1.el8   (RHEL 8.1)
 4.18-rhel8.2.series     4.18.0-193.28.1.el8  (RHEL 8.2)
 4.18-rhel8.3.series     4.18.0-240.22.1.el8  (RHEL 8.3)
-4.18-rhel8.4.series     4.18.0-305.3.1.el8   (RHEL 8.4)
+4.18-rhel8.4.series     4.18.0-305.19.1.el8  (RHEL 8.4)
 
 See lustre/ChangeLog for supported client kernel versions.