diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-06-17 11:43:15 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-06-17 11:46:01 +0200 |
| commit | 8c04ad26ac9fb7a7d1d62e9767b5ea076b8c7d04 (patch) | |
| tree | 4a31d570e9816c71942523386e8aca9a90341e1a | |
| parent | 4acbc1874e02e67d3fe9733dd86afc4402bd8bb1 (diff) | |
Don't run "dpkg --add-architecture i386" on ARMosmith/fix-rpi-gnutls
Building debian-stretch-jenkins on ARM currently results in a few
libraries getting installed for the i386 architecture. This results in
the following build failures for master-osmo-trx and master-osmo-pcu:
checking for LIBGNUTLS... no
configure: error: Package requirements (gnutls >= 2.12.0) were not met:
No package 'gnutls' found
It is weird that we are only seeing this now, the dpkg-line has been in
debian-stretch-jenkins since the Dockerfile was added to osmo-ci four
years ago in Icb0406f96b0c18e77be51ad8317c2668fb23a45e. I'm also
wondering why it was added in the first place, and if we need it
anymore. In any case, running this on anything but x86_64 does not make
sense, so disable it there.
Change-Id: I8d890b7ebc7b99a4c79779709d1e56e0a5a6d4b9
| -rw-r--r-- | debian-buster-jenkins/Dockerfile | 2 | ||||
| -rw-r--r-- | debian-jessie-buildslave/Dockerfile | 2 | ||||
| -rw-r--r-- | debian-stretch-jenkins/Dockerfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index ff69d35..2e3855b 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -14,7 +14,7 @@ ARG DEBIAN_VERSION # Install apt dependencies (keep in alphabetic order) RUN \ - dpkg --add-architecture i386 && \ + [ "$(arch)" = "x86_64" ] && 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 \ diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile index 158e19e..98d70a9 100644 --- a/debian-jessie-buildslave/Dockerfile +++ b/debian-jessie-buildslave/Dockerfile @@ -3,7 +3,7 @@ FROM $USER/debian-jessie-build MAINTAINER Harald Welte <laforge@gnumonks.org> -RUN dpkg --add-architecture i386 && \ +RUN [ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \ apt-get update && \ apt-get install -y --no-install-recommends \ asciidoc \ diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index d794228..b45c1d3 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -14,7 +14,7 @@ ARG DEBIAN_VERSION # Install apt dependencies (keep in alphabetic order) RUN \ - dpkg --add-architecture i386 && \ + [ "$(arch)" = "x86_64" ] && 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 \ |