From: Jian Yu <yujian@whamcloud.com>
Date: Thu, 14 Dec 2023 17:07:48 +0000 (-0800)
Subject: EX-8779 build: kernel-abi-whitelists is not required
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=5c16a2275e17222aa2656b500c65b81ff484b57d;p=fs%2Flustre-release.git

EX-8779 build: kernel-abi-whitelists is not required

This patch fixes build dependency issue with
kernel-abi-whitelists, which is not required.

Test-Parameters: trivial

Change-Id: I3f8ad51a0ccab5c994d472d62934670b497c1454
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/53448
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index af17f4a..070847f 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=true
+USE_KABI=false
 
 # patchless build
 KERNELRPMSBASE=
diff --git a/contrib/lbuild/lbuild-rhel8 b/contrib/lbuild/lbuild-rhel8
index 61d0d62..8c686bc 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=true
+USE_KABI=false
 
 # force local definition of %dist into ~/.rpmmacros
 # to avoid verbose extended strings like ".el8.centos"
diff --git a/lustre.spec.in b/lustre.spec.in
index 99d2faf..d1dc7fc 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -22,7 +22,7 @@
 %bcond_with    systemd
 %bcond_with mofed
 %bcond_without mpi
-%bcond_with kabi
+%bcond_without kabi
 %bcond_without mlnx
 %bcond_with ofed
 
@@ -265,11 +265,6 @@ BuildRequires: rpm-build >= 4.14.3
 BuildRequires: %kernel_module_package_buildreqs
 # need to provide a /usr/lib/${uname -r)/build dir
 BuildRequires: kernel >= 3.10
-%if "%{_vendor}" == "redhat"
-%if %{with kabi}
-BuildRequires: kernel-abi-whitelists
-%endif
-%endif
 %endif
 
 %if %{with systemd}