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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OsmocomBB: Add lua5.3 for the scriping interface<br><br>Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d<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, 31 insertions(+), 6 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 2ad1ec8..71bf9f1 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>@@ -85,3 +85,22 @@</span><br><span>     - libusb-dev</span><br><span>     - libzmq3-dev</span><br><span>     - sqlite3</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+- name: install liblua for jessie</span><br><span style="color: hsl(120, 100%, 40%);">+  apt:</span><br><span style="color: hsl(120, 100%, 40%);">+    name: liblua5.3-dev</span><br><span style="color: hsl(120, 100%, 40%);">+    cache_valid_time: 3600</span><br><span style="color: hsl(120, 100%, 40%);">+    update_cache: yes</span><br><span style="color: hsl(120, 100%, 40%);">+    install_recommends: no</span><br><span style="color: hsl(120, 100%, 40%);">+    default_release: jessie-backports</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+- name: install liblua for stretch</span><br><span style="color: hsl(120, 100%, 40%);">+  apt:</span><br><span style="color: hsl(120, 100%, 40%);">+    name: "{{ item }}"</span><br><span style="color: hsl(120, 100%, 40%);">+    cache_valid_time: 3600</span><br><span style="color: hsl(120, 100%, 40%);">+    update_cache: yes</span><br><span style="color: hsl(120, 100%, 40%);">+    install_recommends: no</span><br><span style="color: hsl(120, 100%, 40%);">+  with_items:</span><br><span style="color: hsl(120, 100%, 40%);">+    - liblua5.3-dev</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'</span><br><span>diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64</span><br><span>index f32a3c3..c996396 100644</span><br><span>--- a/docker/Dockerfile.deb8_amd64</span><br><span>+++ b/docker/Dockerfile.deb8_amd64</span><br><span>@@ -1,6 +1,8 @@</span><br><span> FROM debianjessie</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN dpkg --add-architecture i386 && \</span><br><span style="color: hsl(120, 100%, 40%);">+RUN \</span><br><span style="color: hsl(120, 100%, 40%);">+    echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \</span><br><span style="color: hsl(120, 100%, 40%);">+    dpkg --add-architecture i386 && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make</span><br><span>@@ -26,7 +28,7 @@</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev  libusb-1.0-0-dev libtalloc-dev</span><br><span> </span><br><span> # OsmocomBB</span><br><span style="color: hsl(0, 100%, 40%);">-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi</span><br><span style="color: hsl(120, 100%, 40%);">+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports</span><br><span> </span><br><span> # building</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf stow</span><br><span>diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386</span><br><span>index c9b3aa9..9605106 100644</span><br><span>--- a/docker/Dockerfile.deb8_i386</span><br><span>+++ b/docker/Dockerfile.deb8_i386</span><br><span>@@ -1,6 +1,8 @@</span><br><span> FROM 32bit/debian</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN dpkg --add-architecture i386 && \</span><br><span style="color: hsl(120, 100%, 40%);">+RUN \</span><br><span style="color: hsl(120, 100%, 40%);">+    echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \</span><br><span style="color: hsl(120, 100%, 40%);">+    dpkg --add-architecture i386 && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make</span><br><span>@@ -29,7 +31,7 @@</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libusb-1.0-0-dev libssl-dev libtalloc-dev</span><br><span> </span><br><span> # OsmocomBB</span><br><span style="color: hsl(0, 100%, 40%);">-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi</span><br><span style="color: hsl(120, 100%, 40%);">+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports</span><br><span> </span><br><span> # for osmo-python-tests</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip</span><br><span>diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>index 12154b3..cc68bf4 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,8 @@</span><br><span> FROM debian:jessie</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN dpkg --add-architecture i386 && \</span><br><span style="color: hsl(120, 100%, 40%);">+RUN \</span><br><span style="color: hsl(120, 100%, 40%);">+    echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \</span><br><span style="color: hsl(120, 100%, 40%);">+    dpkg --add-architecture i386 && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \</span><br><span>     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make</span><br><span>@@ -26,7 +28,7 @@</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev  libusb-1.0-0-dev libtalloc-dev libgnutls28-dev</span><br><span> </span><br><span> # OsmocomBB</span><br><span style="color: hsl(0, 100%, 40%);">-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi</span><br><span style="color: hsl(120, 100%, 40%);">+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports</span><br><span> </span><br><span> # building</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10617">change 10617</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/10617"/><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: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d </div>
<div style="display:none"> Gerrit-Change-Number: 10617 </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: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> </div>