From 89c427fe0577f966c5b898dfff8c3d925e3dd380 Mon Sep 17 00:00:00 2001 From: Jan Michalski Date: Thu, 6 Aug 2026 10:46:25 +0000 Subject: [PATCH 1/2] common: adjust build system to versions like 1.4.99-1-g4cff24b Note: None of this affects how DAOS builds PMDK. - RPM version does not accept '-'. Replace them with '~'. - pmdk.spec has to force SRCVERSION so generated *.pc files specify the same version string. - fix test so it accepts '~'. Signed-off-by: Jan Michalski --- utils/docker/test_package/test-packages-installation.py | 3 ++- utils/pkg-common.sh | 2 +- utils/pmdk.spec.in | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/docker/test_package/test-packages-installation.py b/utils/docker/test_package/test-packages-installation.py index ba5e0ee67f..85c7a298ed 100644 --- a/utils/docker/test_package/test-packages-installation.py +++ b/utils/docker/test_package/test-packages-installation.py @@ -99,7 +99,8 @@ def get_incompatible_packages(packages_path, pkgconfig_directory, split_param): for line in out: if 'version=' in line: version = line.split('=')[1].strip(linesep) - if not version in PMDK_VERSION.replace('~', '-'): + if not version in PMDK_VERSION: + print(f'{version} != {PMDK_VERSION}') incompatibe_packages.append(library) return incompatibe_packages diff --git a/utils/pkg-common.sh b/utils/pkg-common.sh index e4e8690373..ec1a608362 100644 --- a/utils/pkg-common.sh +++ b/utils/pkg-common.sh @@ -37,7 +37,7 @@ function check_tool() { } function get_version() { - echo -n $1 | sed "s/-rc/~rc/" + echo -n $1 | sed "s/-/~/g" } function get_os() { diff --git a/utils/pmdk.spec.in b/utils/pmdk.spec.in index 782619d753..8471bae167 100644 --- a/utils/pmdk.spec.in +++ b/utils/pmdk.spec.in @@ -415,6 +415,7 @@ make %{?_smp_mflags} \ %if %{without ndctl} NDCTL_ENABLE=n \ %endif + SRCVERSION=%{version} \ __MAKE_FLAGS__ @@ -424,6 +425,7 @@ make install DESTDIR=%{buildroot} \ %if %{without ndctl} NDCTL_ENABLE=n \ %endif + SRCVERSION=%{version} \ LIB_AR= \ prefix=%{_prefix} \ libdir=%{_libdir} \ From 5cff8a7ef7783654fade41ed6affa3b5b9c10582 Mon Sep 17 00:00:00 2001 From: Jan Michalski Date: Thu, 6 Aug 2026 12:13:44 +0000 Subject: [PATCH 2/2] common: remove debug line Signed-off-by: Jan Michalski --- utils/docker/test_package/test-packages-installation.py | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/docker/test_package/test-packages-installation.py b/utils/docker/test_package/test-packages-installation.py index 85c7a298ed..d7efc9ee25 100644 --- a/utils/docker/test_package/test-packages-installation.py +++ b/utils/docker/test_package/test-packages-installation.py @@ -100,7 +100,6 @@ def get_incompatible_packages(packages_path, pkgconfig_directory, split_param): if 'version=' in line: version = line.split('=')[1].strip(linesep) if not version in PMDK_VERSION: - print(f'{version} != {PMDK_VERSION}') incompatibe_packages.append(library) return incompatibe_packages