Skip to content

common: adjust build system to versions like 1.4.99-1-g4cff24b #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janekmi merged 2 commits into from
Aug 7, 2026
+4 −2
Merged

common: adjust build system to versions like 1.4.99-1-g4cff24b #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89c427f
common: adjust build system to versions like 1.4.99-1-g4cff24b
janekmi Aug 6, 2026
5cff8a7
common: remove debug line
janekmi Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utils/docker/test_package/test-packages-installation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ 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:
incompatibe_packages.append(library)
return incompatibe_packages

Expand Down
2 changes: 1 addition & 1 deletion utils/pkg-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 2 additions & 0 deletions utils/pmdk.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ make %{?_smp_mflags} \
%if %{without ndctl}
NDCTL_ENABLE=n \
%endif
SRCVERSION=%{version} \
__MAKE_FLAGS__


Expand All @@ -424,6 +425,7 @@ make install DESTDIR=%{buildroot} \
%if %{without ndctl}
NDCTL_ENABLE=n \
%endif
SRCVERSION=%{version} \
LIB_AR= \
prefix=%{_prefix} \
libdir=%{_libdir} \
Expand Down
Loading