Merge pull request #1681 from kaysond/patch-1

Fix Debian packaging issues

Author: robertbaldyga

tools/pckgen.d/deb/debian/changelog

@@ -4,6 +4,18 @@
 
  -- <PACKAGE_MAINTAINER>  <PACKAGE_DATE>
 
+open-cas-linux (25.03.0.0980-1) trusty; urgency=medium
+
+  * Fix package build
+
+ -- Rafal Stefanowski <rafal.stefanowski@open-cas.com>  Mon, 08 Sep 2025 13:31:02 +0100
+
+open-cas-linux (25.03.0.0980-1) trusty; urgency=medium
+
+  * Fix package build
+
+ -- Aram Akhavan <github@aram.nubmail.ca>  Mon, 01 Sep 2025 22:27:59 -0700
+
 open-cas-linux (22.03.0.0683-1) trusty; urgency=medium
 
   * Fix debug packages creation

tools/pckgen.d/deb/debian/control

@@ -2,7 +2,7 @@ Source: <CAS_NAME>
 Section: utils
 Priority: optional
 Maintainer: <PACKAGE_MAINTAINER>
-Build-Depends: debhelper (>= 11), gawk, libelf-dev, linux-headers-generic, dkms
+Build-Depends: debhelper (>= 11), gawk, libelf-dev, linux-headers-generic, dkms, dh-dkms
 Standards-Version: 4.1.2
 Homepage: <CAS_HOMEPAGE>
 Vcs-Git: <CAS_GIT>

tools/pckgen.d/deb/debian/rules

@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 #
 # Copyright(c) 2020-2022 Intel Corporation
+# Copyright(c) 2025 Huawei Technologies
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -14,6 +15,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	(cd tools/; ./cas_version_gen.sh build)
+	make -C utils
 	<MAKE_BUILD>
 
 override_dh_auto_install:

tools/pckgen.sh

@@ -42,7 +42,7 @@ DEPENDENCIES_TAR=(tar)
 DEPENDENCIES_ZIP=(zip)
 DEPENDENCIES_RPM=(rpmbuild tar)
 DEPENDENCIES_SRPM=("${DEPENDENCIES_RPM[@]}")
-DEPENDENCIES_DEB=(debuild dh fakeroot tar dkms)
+DEPENDENCIES_DEB=(debuild dh fakeroot tar dkms dh_dkms)
 DEPENDENCIES_DSC=("${DEPENDENCIES_DEB[@]}")
 # List of relative submodule directories:
 SUBMODULES=(
@@ -236,7 +236,9 @@ check_dependencies() {
         DEPENDENCIES+=(${!DEP_NAME})
     done
     for DEP in ${DEPENDENCIES[@]}; do
-        if ! which $DEP &>/dev/null; then
+        # Some distros doesn't include /sbin and /usr/sbin in PATH for
+        # unprivileged users, so append it temporarily for the dependency check.
+        if ! PATH="$PATH:/sbin:/usr/sbin" which $DEP &>/dev/null; then
             local FAILED_DEPS+="$DEP "
         fi
     done

utils/Makefile

@@ -27,6 +27,12 @@ manpage:
 	gzip -k -f opencas.conf.5
 	gzip -k -f casctl.8
 
+clean:
+	@rm -f opencas.conf.5.gz
+	@rm -f casctl.8.gz
+
+distclean: clean
+
 install: install_files
 ifeq (, $(PYTHON3))
 	$(error package 'python3' not found)