diff options
| -rw-r--r-- | ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml | 1 | ||||
| -rw-r--r-- | docker/Dockerfile.deb8_amd64 | 3 | ||||
| -rw-r--r-- | docker/Dockerfile.deb8_i386 | 3 | ||||
| -rw-r--r-- | docker/Dockerfile_osmocom_jenkins.amd64 | 3 |
4 files changed, 10 insertions, 0 deletions
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 2200638..16e72ed 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -47,6 +47,7 @@ - libopencore-amrnb-dev # by LimeSuite - cmake + - patchelf - name: install build dependencies and libraries apt: diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64 index c996396..19e41dc 100644 --- a/docker/Dockerfile.deb8_amd64 +++ b/docker/Dockerfile.deb8_amd64 @@ -38,3 +38,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends py # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc + +# Add rpath to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386 index 9605106..6b45b59 100644 --- a/docker/Dockerfile.deb8_i386 +++ b/docker/Dockerfile.deb8_i386 @@ -38,3 +38,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends py # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc + +# Add rpath to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index cc68bf4..3acff70 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -42,5 +42,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc # and all 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 +# Add rpath to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf + ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh |