Skip to content

Commit 34baa6c

Browse files
author
Rafal Stefanowski
committed
pckgen: Fix DEB package build
Signed-off-by: Rafal Stefanowski <rafal.stefanowski@huawei.com>
1 parent 7ccad4f commit 34baa6c

File tree

5 files changed

+17
-7
lines changed

5 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 <rafal.stefanowski@open-cas.com> 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 <github@aram.nubmail.ca> 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/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Description: Open Cache Acceleration Software
2121

2222
Package: <CAS_NAME>-modules
2323
Architecture: any
24-
Depends: ${misc:Depends}, debhelper (>= 9), dkms
24+
Depends: ${misc:Depends}, debhelper (>= 9), linux-headers-generic, dkms
2525
Description: Open Cache Acceleration Software kernel modules (${kver})
2626
Open Cache Acceleration Software (Open CAS) is an open source project
2727
encompassing block caching software libraries, adapters, tools and more.

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: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ DEPENDENCIES_TAR=(tar)
3838
DEPENDENCIES_ZIP=(zip)
3939
DEPENDENCIES_RPM=(rpmbuild tar)
4040
DEPENDENCIES_SRPM=("${DEPENDENCIES_RPM[@]}")
41-
DEPENDENCIES_DEB=(debuild dh fakeroot tar dkms)
41+
DEPENDENCIES_DEB=(debuild dh fakeroot tar dkms dh_dkms)
4242
DEPENDENCIES_DSC=("${DEPENDENCIES_DEB[@]}")
4343
# List of relative submodule directories:
4444
SUBMODULES=(
@@ -245,10 +245,6 @@ check_dependencies() {
245245
fi
246246
done
247247

248-
if [ "$GENERATE_DEB" ] && ! { apt list --installed dh-dkms | grep -q installed; } 2> /dev/null; then
249-
local FAILED_DEPS+="dh-dkms "
250-
fi
251-
252248
if [ "$FAILED_DEPS" ]; then
253249
error "Dependencies not installed. You need to provide these programs first: $FAILED_DEPS"
254250
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)