Whamcloud - gitweb
LU-16657 build: don't need to use zfs kmodtool on RHEL9.1 46/50746/2
authorMinh Diep <mdiep@whamcloud.com>
Tue, 25 Apr 2023 18:44:46 +0000 (11:44 -0700)
committerOleg Drokin <green@whamcloud.com>
Mon, 1 May 2023 04:13:04 +0000 (04:13 +0000)
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 <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50746
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Alex Deiter <alex.deiter@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
contrib/lbuild/lbuild

index cbe5f58..09e48a4 100755 (executable)
@@ -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