Skip to content

Commit 52d48a9

Browse files
author
Rafal Stefanowski
committed
pckgen: Fix DEB package build
Signed-off-by: Rafal Stefanowski <[email protected]>
1 parent 05f4606 commit 52d48a9

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

tools/pckgen.d/deb/debian/changelog

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@
44

55
-- <PACKAGE_MAINTAINER> <PACKAGE_DATE>
66

7+
open-cas-linux (25.03.0.0980-1) trusty; urgency=medium
8+
9+
* Fix package build
10+
11+
-- Rafal Stefanowski <[email protected]> Mon, 08 Sep 2025 13:31:02 +0100
12+
13+
open-cas-linux (25.03.0.0980-1) trusty; urgency=medium
14+
15+
* Fix package build
16+
17+
-- Aram Akhavan <[email protected]> Mon, 01 Sep 2025 22:27:59 -0700
18+
719
open-cas-linux (22.03.0.0683-1) trusty; urgency=medium
820

921
* Fix debug packages creation

tools/pckgen.d/deb/debian/rules

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/make -f
22
#
33
# Copyright(c) 2020-2022 Intel Corporation
4+
# Copyright(c) 2025 Huawei Technologies
45
# SPDX-License-Identifier: BSD-3-Clause
56
#
67

@@ -14,6 +15,7 @@ override_dh_auto_configure:
1415

1516
override_dh_auto_build:
1617
(cd tools/; ./cas_version_gen.sh build)
18+
make -C utils
1719
<MAKE_BUILD>
1820

1921
override_dh_auto_install:

tools/pckgen.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ DEPENDENCIES_TAR=(tar)
4242
DEPENDENCIES_ZIP=(zip)
4343
DEPENDENCIES_RPM=(rpmbuild tar)
4444
DEPENDENCIES_SRPM=("${DEPENDENCIES_RPM[@]}")
45-
DEPENDENCIES_DEB=(debuild dh fakeroot tar dkms)
45+
DEPENDENCIES_DEB=(debuild dh fakeroot tar dkms dh_dkms)
4646
DEPENDENCIES_DSC=("${DEPENDENCIES_DEB[@]}")
4747
# List of relative submodule directories:
4848
SUBMODULES=(
@@ -236,15 +236,11 @@ check_dependencies() {
236236
DEPENDENCIES+=(${!DEP_NAME})
237237
done
238238
for DEP in ${DEPENDENCIES[@]}; do
239-
if ! which $DEP &>/dev/null; then
239+
if ! PATH="$PATH:/sbin:/usr/sbin" which $DEP &>/dev/null; then
240240
local FAILED_DEPS+="$DEP "
241241
fi
242242
done
243243

244-
if [ "$GENERATE_DEB" ] && ! { apt list --installed dh-dkms | grep -q installed; } 2> /dev/null; then
245-
local FAILED_DEPS+="dh-dkms "
246-
fi
247-
248244
if [ "$FAILED_DEPS" ]; then
249245
error "Dependencies not installed. You need to provide these programs first: $FAILED_DEPS"
250246
fi

utils/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ else
4343
@$(SYSTEMCTL) -q enable open-cas
4444
@mandb -q
4545

46-
install_files: manpage
46+
install_files:
4747
@echo "Installing Open-CAS utils"
4848

4949
@install -m 644 -D $(UTILS_DIR)/opencas.conf $(DESTDIR)/etc/opencas/opencas.conf

0 commit comments

Comments
 (0)