Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit 686cd39

Browse files
docker: update PMDK version to current master
to include fix for rpm packaging.
1 parent 5c311e3 commit 686cd39

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

utils/docker/images/Dockerfile.fedora-33

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,9 @@ RUN dnf update -y \
9292
COPY install-valgrind.sh install-valgrind.sh
9393
RUN ./install-valgrind.sh
9494

95-
# Install pmdk from sources, because of:
96-
# https://github.com/pmem/pmdk/issues/4938
95+
# Install pmdk
9796
COPY install-pmdk.sh install-pmdk.sh
98-
RUN ./install-pmdk.sh
97+
RUN ./install-pmdk.sh rpm
9998

10099
# Add user
101100
ENV USER user

utils/docker/images/install-pmdk.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99

1010
set -e
1111

12-
PACKAGE_MANAGER=${1}
13-
14-
# common: 1.9.2, 28.10.2020
15-
PMDK_VERSION="1.9.2"
16-
1712
if [ "${SKIP_PMDK_BUILD}" ]; then
1813
echo "Variable 'SKIP_PMDK_BUILD' is set; skipping building PMDK"
1914
exit
2015
fi
2116

17+
PACKAGE_MANAGER=${1}
18+
19+
# master: Merge pull request #5150 from kilobyte/rpm-no-lto, 16.02.2021
20+
# contains fix for packaging
21+
PMDK_VERSION="7f88d9fae088b81936d2f6d5235169e90e7478c7"
22+
2223
git clone https://github.com/pmem/pmdk
2324
cd pmdk
2425
git checkout ${PMDK_VERSION}

0 commit comments

Comments
 (0)