From: Minh Diep <mdiep@whamcloud.com>
Date: Wed, 1 Jun 2022 19:48:37 +0000 (-0700)
Subject: LU-15795 lbuild: enable KABI
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=03fc87a2ba08e5c4b8b8787f19b4e736d2752fae;p=fs%2Flustre-release.git

LU-15795 lbuild: enable KABI

Enable build kabi and clean up kmodtool patch

Test-Parameters: trivial

Change-Id: I16d54af0004c4ddc1cc5e6acca81e4aa89a1a1c1
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 1f64c5d..340d70e 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"
- }
-