summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2018-08-26 16:20:37 +0100
committerHolger Freyther <holger@freyther.de>2018-08-30 15:09:54 +0000
commitc52d3505f85399811a6eb09a482e83adf34d7268 (patch)
tree9d1c2e2435779689bd97a0ce6023454861ea48f2
parentfa24bc77ef515240053fa73b6a0d52690c1b59e8 (diff)
OsmocomBB: Add lua5.3 for the scriping interface
-rw-r--r--ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml19
-rw-r--r--docker/Dockerfile.deb8_amd646
-rw-r--r--docker/Dockerfile.deb8_i3866
-rw-r--r--docker/Dockerfile_osmocom_jenkins.amd646
4 files changed, 31 insertions, 6 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 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 fl
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 --no-install-recommends fl
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 fl
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