From 8a967f69e1f7f3e5b72766ae47db3bf64c76bac0 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Tue, 25 Apr 2023 11:44:46 -0700 Subject: [PATCH] LU-16657 build: don't need to use zfs kmodtool on RHEL9.1 Test-Parameters: trivial fstype=zfs \ clientdistro=el9.1 serverdistro=el9.1 testlist=sanity Test-Parameters: trivial fstype=zfs \ clientdistro=el8.7 serverdistro=el8.7 testlist=sanity Test-Parameters: trivial fstype=ldiskfs \ clientdistro=el9.1 serverdistro=el9.1 testlist=sanity Test-Parameters: trivial fstype=ldiskfs \ clientdistro=el8.7 serverdistro=el8.7 testlist=sanity Change-Id: I11ca6a01cb9ddc6e59bf91e1bee35a3ceccb725a Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50746 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Alex Deiter Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index cbe5f58..09e48a4 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1074,7 +1074,11 @@ build_spl_zfs() { speclist="$pkg.spec $rpmpkg.spec" else rpmpkg=kmod-$pkg-devel - specdir=rpm/generic + if [[ $DISTROMAJ > "rhel8" ]]; then + specdir=rpm/redhat + else + specdir=rpm/generic + fi speclist="$pkg.spec $pkg-kmod.spec $pkg-dkms.spec" fi -- 1.8.3.1