Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Holger Freyther gerrit-no-reply at lists.osmocom.org
Thu Aug 30 15:09:54 UTC 2018 

Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10617 )

Change subject: OsmocomBB: Add lua5.3 for the scriping interface
......................................................................

OsmocomBB: Add lua5.3 for the scriping interface

Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d
---
M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
M docker/Dockerfile.deb8_amd64
M docker/Dockerfile.deb8_i386
M docker/Dockerfile_osmocom_jenkins.amd64
4 files changed, 31 insertions(+), 6 deletions(-)

Approvals:
  Holger Freyther: Looks good to me, approved; Verified
  Harald Welte: Looks good to me, but someone else must approve



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 2ad1ec8..71bf9f1 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
@@ -85,3 +85,22 @@
     - libusb-dev
     - libzmq3-dev
     - sqlite3
+
+- name: install liblua for jessie
+  apt:
+    name: liblua5.3-dev
+    cache_valid_time: 3600
+    update_cache: yes
+    install_recommends: no
+    default_release: jessie-backports
+  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie'
+
+- name: install liblua for stretch
+  apt:
+    name: "{{ item }}"
+    cache_valid_time: 3600
+    update_cache: yes
+    install_recommends: no
+  with_items:
+    - liblua5.3-dev
+  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64
index f32a3c3..c996396 100644
--- a/docker/Dockerfile.deb8_amd64
+++ b/docker/Dockerfile.deb8_amd64
@@ -1,6 +1,8 @@
 FROM debianjessie
 
-RUN dpkg --add-architecture i386 && \
+RUN \
+    echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \
+    dpkg --add-architecture i386 && \
     DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make
@@ -26,7 +28,7 @@
 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
 
 # OsmocomBB
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports
 
 # building
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf stow
diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386
index c9b3aa9..9605106 100644
--- a/docker/Dockerfile.deb8_i386
+++ b/docker/Dockerfile.deb8_i386
@@ -1,6 +1,8 @@
 FROM 32bit/debian
 
-RUN dpkg --add-architecture i386 && \
+RUN \
+    echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \
+    dpkg --add-architecture i386 && \
     DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make
@@ -29,7 +31,7 @@
 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
 
 # OsmocomBB
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports
 
 # for osmo-python-tests
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64
index 12154b3..cc68bf4 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -1,6 +1,8 @@
 FROM debian:jessie
 
-RUN dpkg --add-architecture i386 && \
+RUN \
+    echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \
+    dpkg --add-architecture i386 && \
     DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make
@@ -26,7 +28,7 @@
 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
 
 # OsmocomBB
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports
 
 # building
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf

-- 
To view, visit https://gerrit.osmocom.org/10617
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d
Gerrit-Change-Number: 10617
Gerrit-PatchSet: 3
Gerrit-Owner: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180830/fc9f7538/attachment.htm>

More information about the gerrit-log mailing list