Allow bulding RPMs with mock

To facilitate building with mock allow specifying the mock "root" to
build in.

Allow specifying the kernel version to build for.

Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>

Author: brianjmurrell

Makefile

@@ -1,6 +1,7 @@
 #
 # Copyright(c) 2012-2022 Intel Corporation
 # Copyright(c) 2024 Huawei Technologies
+# Copyright(c) 2025 Brian J. Murrell
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -29,11 +30,22 @@ endif
 endif
 endif
 
+ifneq ($(KERNEL_VERSION),)
+BUILD_ARGS=--kernel_version $(KERNEL_VERSION)
+endif
+
+ifneq ($(MOCK_ROOT),)
+ifeq ($(KERNEL_VERSION),)
+$(error KERNEL_VERSION must be set when using MOCK_ROOT)
+endif
+BUILD_ARGS=--mock_root $(MOCK_ROOT) --kernel_version $(KERNEL_VERSION)
+endif
+
 archives:
 	@tools/pckgen.sh $(PWD) tar zip
 
 rpm:
-	@tools/pckgen.sh $(PWD) rpm --debug
+	@tools/pckgen.sh $(PWD) rpm --debug $(BUILD_ARGS)
 
 srpm:
 	@tools/pckgen.sh $(PWD) srpm

tools/pckgen.d/rpm/CAS_NAME.spec

@@ -1,5 +1,6 @@
 #
 # Copyright(c) 2020-2022 Intel Corporation
+# Copyright(c) 2025 Brian J. Murrell
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -12,8 +13,11 @@
 
 %global __python %{__python3}
 <DEBUG_PACKAGE>
+%if 0%{!?kver:1}
 %define kver %(uname -r)
-%define kver_filename k%{expand:%(kname="%{kver}"; echo "${kname%.*}" | sed -r "y/-/_/;")}
+%endif
+%define kver_base %{expand:%(kname="%{kver}"; echo "${kname%.*}")}
+%define kver_filename k%{expand:%(echo "%kver_base" | sed -r "y/-/_/;")}
 
 
 Name:       <CAS_NAME>
@@ -26,7 +30,16 @@ License:    <CAS_LICENSE_NAME>
 URL:        <CAS_HOMEPAGE>
 Source0:    https://github.com/Open-CAS/<CAS_NAME>/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Packager:   <PACKAGE_MAINTAINER>
-BuildRequires:  coreutils, gawk, gcc, kernel-devel, kernel-headers, make
+BuildRequires:  coreutils
+BuildRequires:  gawk
+BuildRequires:  gcc
+BuildRequires:  kernel-core = %{kver_base}
+BuildRequires:  kernel-devel = %{kver_base}
+BuildRequires:  kernel-headers
+BuildRequires:  make
+BuildRequires:  python3
+BuildRequires:  elfutils-libelf-devel
+BuildRequires:  procps-ng
 Requires:   <CAS_NAME>-modules-%{version}, python3, sed, python3-PyYAML
 %description
 Open Cache Acceleration Software (Open CAS) is an open source project
@@ -52,16 +65,18 @@ This package contains only CAS kernel modules.
 
 %prep
 %setup -q
+sed -i 's/@mandb -q/#@mandb -q/' {casadm,utils}/Makefile
 
 
 %build
+export KERNEL_DIR=/lib/modules/%{kver}/build/
 ./configure
 <MAKE_BUILD>
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-/usr/bin/make install_files DESTDIR=$RPM_BUILD_ROOT
+/usr/bin/make install_files KERNEL_VERSION=%{kver} DESTDIR=$RPM_BUILD_ROOT
 
 
 %post
@@ -161,6 +176,10 @@ fi
 
 
 %changelog
+* Thu Aug 7 2025 Brian J. Murrell <brian@interlinx.bc.ca> - 25.03-1
+- Make more portable:
+  - Allow external definition of kver
+- Add missing BRs kernel-core, python3, elfutils-libelf-devel, procps-ng
 * Mon Mar 21 2022 Rafal Stefanowski <rafal.stefanowski@intel.com> - 22.03-1
 - Update modules destination directory and permissions
 - Add license to modules package

tools/pckgen.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright(c) 2020-2022 Intel Corporation
+# Copyright(c) 2025 Brian J. Murrell
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -402,13 +403,23 @@ generate_rpm() {
         mv -ft "$OUTPUT_DIR" "$RPM_SRPMS_DIR"/*
     fi
     if [ "$GENERATE_SRPM" ] && [ "$GENERATE_RPM" ]; then
-        echo "--- Building source and binary RPM packages"
-        (HOME="$TEMP_DIR"; rpmbuild -ba --target "$ARCH" "$RPM_SPECS_DIR/$CAS_NAME.spec")
-        if [ $? -ne 0 ]; then
-            error "couldn't create RPM packages"
+        if [ -z "$MOCK_ROOT" ]; then
+            echo "--- Building source and binary RPM packages"
+            if ! (HOME="$TEMP_DIR"; rpmbuild -ba --target "$ARCH" "$RPM_SPECS_DIR/$CAS_NAME.spec"); then
+                error "couldn't create RPM packages"
+            fi
+            mv -ft "$OUTPUT_DIR" "$RPM_SRPMS_DIR"/*
+            mv -ft "$OUTPUT_DIR" "$RPM_RPMS_DIR/$ARCH"/*
+        else
+            echo "--- Building source and binary RPM packages using mock"
+            # shellcheck disable=SC1083
+            if ! mock --no-clean ${KVER:+--define="kver $KVER"} -r "$MOCK_ROOT" packages/"$CAS_NAME"-"$CAS_VERSION"-1"$(rpm --eval %{dist})".src.rpm; then
+                error "couldn't create RPM packages"
+            fi
+            mv -ft "$OUTPUT_DIR" /var/lib/mock/"$MOCK_ROOT"/result/"$CAS_NAME"-"$CAS_VERSION"-1.*.src.rpm
+            mv -ft "$OUTPUT_DIR" /var/lib/mock/"$MOCK_ROOT"/result/"$CAS_NAME"-"$CAS_VERSION"-1.*.x86_64.rpm
+            mv -ft "$OUTPUT_DIR" /var/lib/mock/"$MOCK_ROOT"/result/"$CAS_NAME"-modules_k*-"$CAS_VERSION"-1.*.x86_64.rpm
         fi
-        mv -ft "$OUTPUT_DIR" "$RPM_SRPMS_DIR"/*
-        mv -ft "$OUTPUT_DIR" "$RPM_RPMS_DIR/$ARCH"/*
     fi
 
     RPM_BUILT="rpm_built"
@@ -510,6 +521,15 @@ while (( $# )); do
             print_help
             exit 0
             ;;
+        --mock_root)
+            MOCK_ROOT="$2"
+            shift
+            GENERATE_SRPM="generate_srpm"
+            ;;
+        --kernel_version)
+            KVER="$2"
+            shift
+            ;;
         *)
             if [ -d "$1" ]; then
                 SOURCES_DIR=$(realpath "$1")