From 0a639a32cf32423e826420e24726912d5a39f13e Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Tue, 20 Sep 2022 11:24:54 -0700 Subject: [PATCH] LU-15795 lbuild: enable KABI Enable build kabi and clean up kmodtool patch Test-Parameters: trivial fstype=ldiskfs clientdistro=el8.5 serverdistro=el8.5 Test-Parameters: trivial fstype=ldiskfs clientdistro=el8.6 serverdistro=el8.6 Change-Id: I16d54af0004c4ddc1cc5e6acca81e4aa89a1a1c1 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/47507 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 2 +- contrib/lbuild/lbuild-rhel8 | 3 +-- contrib/lbuild/rhel8/kmodtool.patch | 17 ----------------- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 contrib/lbuild/rhel8/kmodtool.patch diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index eee667e..d236071 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -73,7 +73,7 @@ KERNELTREE= KERNEL_LUSTRE_NAMING=false ENABLE_KERNEL_DEBUG=false # default not use kabi check. -USE_KABI=false +USE_KABI=true # patchless build KERNELRPMSBASE= diff --git a/contrib/lbuild/lbuild-rhel8 b/contrib/lbuild/lbuild-rhel8 index beeb6f2..61d0d62 100644 --- a/contrib/lbuild/lbuild-rhel8 +++ b/contrib/lbuild/lbuild-rhel8 @@ -8,7 +8,7 @@ BUILD_GEN+=".0" SPEC_NAME="kernel.spec" DEVEL_PATH_ARCH_DELIMETER="." -USE_KABI=false +USE_KABI=true # force local definition of %dist into ~/.rpmmacros # to avoid verbose extended strings like ".el8.centos" @@ -24,7 +24,6 @@ RHEL_KMODTOOL=/usr/lib/rpm/redhat/kmodtool LBUILD_KMODTOOL="${LBUILD_DIR}/rhel8/kmodtool" cp $RHEL_KMODTOOL $LBUILD_KMODTOOL pushd ${LBUILD_DIR}/rhel8 -patch -p1 < kmodtool.patch # Replace the hardcoded /usr/src/kernels with our build path tmp="${TOPDIR}/reused/usr/src/kernels" tmp="${tmp//\//\\/}" diff --git a/contrib/lbuild/rhel8/kmodtool.patch b/contrib/lbuild/rhel8/kmodtool.patch deleted file mode 100644 index 52ce2c1..0000000 --- a/contrib/lbuild/rhel8/kmodtool.patch +++ /dev/null @@ -1,17 +0,0 @@ -lbuild does not install the kernel source in the standard RHEL7 location. -RHEL's kmodtool (starting in RHEL7) expects the source to be in the standard -location, and when it fails to find it it adds an extra $arch onto the end -of verrel. With lbuild, verrel already contains the arch, so we change the -kmodtool script so that it does not add another. - ---- old/kmodtool 2016-06-07 14:36:20.810907740 -0700 -+++ new/kmodtool 2016-06-07 14:37:55.335652424 -0700 -@@ -62,7 +62,7 @@ get_kernel_release () - local versuffix=${verrel#$verprefix} - verrel=$(ls -Ud /usr/src/kernels/$verprefix*$versuffix.$arch | sort -V | tail -n 1) - verrel=${verrel##*/} -- [[ -z $verrel ]] && verrel=$1.$arch -+ [[ -z $verrel ]] && verrel=$1 - echo "$verrel" - } - -- 1.8.3.1