X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild-rhel8;h=7437392bfab13d2fd5b7e763415c0d1d1299427c;hp=77b4fa4c6f9dffdfa6c9a026b13e036799b1ba51;hb=cf48a2d23bca685e1076e45370c5d3763c9a9952;hpb=f176efd183ead0b3008eb502c78b00f0c127f992

diff --git a/contrib/lbuild/lbuild-rhel8 b/contrib/lbuild/lbuild-rhel8
index 77b4fa4..7437392 100644
--- a/contrib/lbuild/lbuild-rhel8
+++ b/contrib/lbuild/lbuild-rhel8
@@ -68,12 +68,6 @@ Patch99995: patch-%{version}-lustre.patch' \
 # lustre patch\
 ApplyOptionalPatch patch-%{version}-lustre.patch\
 ' \
-           -e '/rm -f include\/generated\/kernel.cross/i\
-  # lustre kernel config.\
-  if [ -f %{_topdir}/lustre/lustre/kernel_patches/kernel_configs/kernel-%{version}-4.18-rhel8-%{_target_cpu}.config ]; then\
-    echo "# $Arch" > configs/kernel-%{version}-%{_target_cpu}.config\
-    cat %{_topdir}/lustre/lustre/kernel_patches/kernel_configs/kernel-%{version}-4.18-rhel8-%{_target_cpu}.config >> configs/kernel-%{version}-%{_target_cpu}.config\
-  fi'\
            -e '/^# Dynamically generate kernel/a echo "CONFIG_BH_LRU_SIZE=16" >> config-generic'\
           SPECS/$SPEC_NAME 2>&1 || \
         fatal 1 "Error while editing SPECS/$SPEC_NAME"
@@ -114,15 +108,21 @@ find_linux_rpm-rhel8() {
 }
 
 kernel_srpm_location() {
+	local kdir
 
-    echo "http://vault.centos.org/centos/8/updates/Source/SPackages/"
+	case $lnxrel in
+		*8_3) kdir="8.3.2011" ;;
+		*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() {