From 2156e7ce858c62540c93de0ba8c0987518d0cddc Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Thu, 29 Aug 2024 13:47:16 +0200 Subject: [PATCH] Revert "ci: build the librpma fio engine" This reverts commit 4e2bd713356cfc89ea6c898985c492af93b34a5d. --- ci/actions-install.sh | 7 +------ ...ctions-install-librpma.sh => travis-install-librpma.sh} | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) rename ci/{actions-install-librpma.sh => travis-install-librpma.sh} (74%) 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/actions-install-librpma.sh b/ci/travis-install-librpma.sh similarity index 74% rename from ci/actions-install-librpma.sh rename to ci/travis-install-librpma.sh index 31f9f712..4e5ed21d 100755 --- a/ci/actions-install-librpma.sh +++ b/ci/travis-install-librpma.sh @@ -1,6 +1,7 @@ #!/bin/bash -e -LIBRPMA_VERSION="1.0.0" +# 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) -- 2.25.1