<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15759">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">docker: add more dependencies<br><br>Prepare for building almost all Osmocom repositories in docker, by<br>installing new required dependencies:<br><br>* libaio-dev: needed for osmo-ccid-firmware<br>* libasound2-dev: needed for gapk<br>* libboost-all-dev: needed for libusrp<br>* libcsv-dev: needed for osmo-remsim<br>* libmnl-dev: needed for libgtpnl<br>* libnewlib-arm-none-eabi: needed to cross compile libosmocore to arm<br>* liboping-dev: needed for osmo-sysmon<br>* libulfius: needed for osmo-remsim (libulfius is not packaged in debian<br> stretch, download the project's official .deb release instead)<br>* libzmq3-dev: needed for osmo-pcap<br>* sdcc: needed for libusrp<br>* systemd: needed for osmo-remsim (provides systemd.pc, indirect<br> dependency through libulfius)<br><br>Related: OS#3726<br>Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8<br>---<br>M docker/Dockerfile_osmocom_jenkins.amd64<br>1 file changed, 16 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>index 897db15..58e1ee9 100644</span><br><span>--- a/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>+++ b/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>@@ -1,6 +1,10 @@</span><br><span> ARG DEBIAN_VERSION=stretch</span><br><span> FROM debian:${DEBIAN_VERSION}</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Make "$DEBIAN_VERSION" available after FROM</span><br><span style="color: hsl(120, 100%, 40%);">+# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DEBIAN_VERSION</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN \</span><br><span> dpkg --add-architecture i386 && \</span><br><span> DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span>@@ -43,7 +47,7 @@</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc</span><br><span> </span><br><span> # and all</span><br><span style="color: hsl(0, 100%, 40%);">-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 style="color: hsl(120, 100%, 40%);">+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 libnewlib-arm-none-eabi libaio-dev libasound2-dev libzmq3-dev libmnl-dev libboost-all-dev sdcc liboping-dev libcsv-dev systemd</span><br><span> </span><br><span> # Add rpath to binaries</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf</span><br><span>@@ -69,3 +73,14 @@</span><br><span> # Code coverage tools</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y lcov</span><br><span> RUN pip3 install git+https://github.com/eriwen/lcov-to-cobertura-xml/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above)</span><br><span style="color: hsl(120, 100%, 40%);">+ARG LIBULFIUS_VER="2.6.4"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}"</span><br><span style="color: hsl(120, 100%, 40%);">+ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb</span><br><span style="color: hsl(120, 100%, 40%);">+ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz</span><br><span style="color: hsl(120, 100%, 40%);">+RUN cd /tmp/ulfius && \</span><br><span style="color: hsl(120, 100%, 40%);">+ tar -xvf all.tar.gz && \</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/ulfius/*.deb && \</span><br><span style="color: hsl(120, 100%, 40%);">+ cd ~ && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm -r /tmp/ulfius</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/15759">change 15759</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/c/osmo-ci/+/15759"/><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-Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 </div>
<div style="display:none"> Gerrit-Change-Number: 15759 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>