diff --git a/docker/Dockerfile_raspbian_10_armhf b/docker/Dockerfile_raspbian_10_armhf index 8072df254c35b2e8b3cc41125588611597d401dd..44a6e26c16d92261b4583c7770e381b254b13325 100644 --- a/docker/Dockerfile_raspbian_10_armhf +++ b/docker/Dockerfile_raspbian_10_armhf @@ -1,9 +1,5 @@ FROM debian:buster -# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17 -# Remove next line as soon as we get Docker 18 + -COPY qemu-static/qemu-arm-static /usr/bin/qemu-arm-static - ENV DEBIAN_FRONTEND noninteractive # Add armhf dpkg architecture and add cross-compiling toolchain and diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py index 7b5188958a2f666cebc55f1bbd643832cfba4f28..310384e15ffed079c4f83c4faba999be94335ede 100755 --- a/scripts/make-packaging-target.py +++ b/scripts/make-packaging-target.py @@ -238,7 +238,6 @@ def run_generate_all(parsed_args): "debian_packaging_override": "", "output_file": "$(DEBIAN_DSC_FILENAME)", "options": "--privileged --security-opt apparmor=docker-default", - "qemu_static": 'qemu-arm-static', }, { "distribution": "raspbian_10_armhf_oci", @@ -247,7 +246,6 @@ def run_generate_all(parsed_args): "output_file": "$(DEBIAN_DSC_FILENAME)", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "version": "$(DEBIAN_OCI_VERSION)", - "qemu_static": 'qemu-arm-static', }, # Ubuntu {