From 3cee04dddb2b2eb457494eeebd5bd59a12099fe8 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 5 Oct 2020 12:42:09 +0200 Subject: [PATCH] ogt: Update installed patchelf to required version 0.11 osmo-gsm-tester requires patchelf 0.11 since a while ago to solve some bugs on older versions. See osmo-ci d276db78afbb3f28fc6a4a949bca131d0cfac1d4 for more information. Related: OS#4389 Change-Id: I3a0c2168420d2a4ee2302a191824f571ec17786b --- osmo-gsm-tester/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index 0473f96d..0c4bb5cd 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -62,15 +62,15 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ update-locale LANG=en_US.UTF-8 ENV LANG en_US.UTF-8 -# We require a newer patchelf for srsue (OS#4389) -ADD https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2 /tmp/patchelf-0.10.tar.bz2 +# We require a newer patchelf 0.11 (OS#4389) +ADD https://github.com/NixOS/patchelf/archive/0.11.tar.gz /tmp/patchelf-0.11.tar.gz RUN cd /tmp && \ - tar -jxf /tmp/patchelf-0.10.tar.bz2 && \ - cd patchelf-0.10 && \ - ./configure --prefix=/opt && \ + tar -zxf /tmp/patchelf-0.11.tar.gz && \ + cd patchelf-0.11 && \ + autoreconf -fi && \ + ./configure --prefix=/usr/local && \ make && \ - mkdir -p /opt/bin/ && \ - cp src/patchelf /opt/bin/patchelf-v0.10 + make install ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"