From: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
Date: Thu, 29 Aug 2024 11:47:16 +0000 (+0200)
Subject: Revert "ci: build the librpma fio engine"
X-Git-Tag: fio-3.38~30^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2156e7ce858c62540c93de0ba8c0987518d0cddc;p=fio.git

Revert "ci: build the librpma fio engine"

This reverts commit 4e2bd713356cfc89ea6c898985c492af93b34a5d.
---

diff --git a/ci/actions-install-librpma.sh b/ci/actions-install-librpma.sh
deleted file mode 100755
index 31f9f712..00000000
--- a/ci/actions-install-librpma.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-LIBRPMA_VERSION="1.0.0"
-ZIP_FILE=rpma.zip
-
-WORKDIR=$(pwd)
-
-# install librpma
-wget -O $ZIP_FILE https://github.com/pmem/rpma/archive/${LIBRPMA_VERSION}.zip
-unzip $ZIP_FILE
-mkdir -p rpma-${LIBRPMA_VERSION}/build
-cd rpma-${LIBRPMA_VERSION}/build
-cmake .. -DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DBUILD_DOC=OFF \
-	-DBUILD_EXAMPLES=OFF \
-	-DBUILD_TESTS=OFF
-make -j"$(nproc)"
-sudo make -j"$(nproc)" install
-cd "$WORKDIR"
-rm -rf $ZIP_FILE rpma-${LIBRPMA_VERSION}
diff --git a/ci/actions-install.sh b/ci/actions-install.sh
index 77c511af..1895e519 100755
--- a/ci/actions-install.sh
+++ b/ci/actions-install.sh
@@ -54,8 +54,7 @@ DPKGCFG
                 libiscsi-dev
                 libnbd-dev
                 libpmem-dev
-                libpmem2-dev
-                libprotobuf-c-dev
+                libpmemblk-dev
                 librbd-dev
                 libtcmalloc-minimal4
                 libibverbs-dev
@@ -96,10 +95,6 @@ DPKGCFG
     sudo apt-get -qq update
     echo "Installing packages... ${pkgs[@]}"
     sudo apt-get install -o APT::Immediate-Configure=false --no-install-recommends -qq -y "${pkgs[@]}"
-    if [ "${CI_TARGET_ARCH}" == "x86_64" ]; then
-        # install librpma from sources
-        ci/actions-install-librpma.sh
-    fi
 }
 
 # Fedora and related distributions
diff --git a/ci/travis-install-librpma.sh b/ci/travis-install-librpma.sh
new file mode 100755
index 00000000..4e5ed21d
--- /dev/null
+++ b/ci/travis-install-librpma.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+
+# 11.02.2021 Merge pull request #866 from ldorau/rpma-mmap-memory-for-rpma_mr_reg-in-rpma_flush_apm_new
+LIBRPMA_VERSION=fbac593917e98f3f26abf14f4fad5a832b330f5c
+ZIP_FILE=rpma.zip
+
+WORKDIR=$(pwd)
+
+# install librpma
+wget -O $ZIP_FILE https://github.com/pmem/rpma/archive/${LIBRPMA_VERSION}.zip
+unzip $ZIP_FILE
+mkdir -p rpma-${LIBRPMA_VERSION}/build
+cd rpma-${LIBRPMA_VERSION}/build
+cmake .. -DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DBUILD_DOC=OFF \
+	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_TESTS=OFF
+make -j"$(nproc)"
+sudo make -j"$(nproc)" install
+cd "$WORKDIR"
+rm -rf $ZIP_FILE rpma-${LIBRPMA_VERSION}