<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11579">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Holger Freyther: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">misc: Install patchelf to add/set an rpath if wanted<br><br>Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857<br>---<br>M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml<br>M docker/Dockerfile.deb8_amd64<br>M docker/Dockerfile.deb8_i386<br>M docker/Dockerfile_osmocom_jenkins.amd64<br>4 files changed, 10 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml</span><br><span>index 2200638..16e72ed 100644</span><br><span>--- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml</span><br><span>@@ -47,6 +47,7 @@</span><br><span>     - libopencore-amrnb-dev</span><br><span>     # by LimeSuite</span><br><span>     - cmake</span><br><span style="color: hsl(120, 100%, 40%);">+    - patchelf</span><br><span> </span><br><span> - name: install build dependencies and libraries</span><br><span>   apt:</span><br><span>diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64</span><br><span>index c996396..19e41dc 100644</span><br><span>--- a/docker/Dockerfile.deb8_amd64</span><br><span>+++ b/docker/Dockerfile.deb8_amd64</span><br><span>@@ -38,3 +38,6 @@</span><br><span> </span><br><span> # Linux kernel</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Add rpath to binaries</span><br><span style="color: hsl(120, 100%, 40%);">+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf</span><br><span>diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386</span><br><span>index 9605106..6b45b59 100644</span><br><span>--- a/docker/Dockerfile.deb8_i386</span><br><span>+++ b/docker/Dockerfile.deb8_i386</span><br><span>@@ -38,3 +38,6 @@</span><br><span> </span><br><span> # Linux kernel</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Add rpath to binaries</span><br><span style="color: hsl(120, 100%, 40%);">+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf</span><br><span>diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>index cc68bf4..3acff70 100644</span><br><span>--- a/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>+++ b/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>@@ -42,5 +42,8 @@</span><br><span> # and all</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev libpcsclite-dev make gcc pkgconf libtool autoconf autoconf-archive automake libortp-dev asciidoc mscgen git libsctp-dev libpcap-dev osc libc-ares-dev libgps-dev  libsofia-sip-ua-glib-dev  libssl-dev libsqlite3-dev libusb-dev libffi-dev libfftw3-dev flex bison libdbi-dev  libsnmp-dev libncurses5-dev libgsm1-dev python-minimal python3 libdbd-sqlite3 cppcheck htop  libgmp-dev gawk texinfo flex bison bc  libsigsegv-dev libffi-dev libusb-1.0-0-dev  libreadline-dev debhelper devscripts gcc-arm-none-eabi git-buildpackage dh-systemd dh-autoreconf bc openssh-client stow</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Add rpath to binaries</span><br><span style="color: hsl(120, 100%, 40%);">+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit</span><br><span> RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11579">change 11579</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11579"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 </div>
<div style="display:none"> Gerrit-Change-Number: 11579 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>