From e6b6c694dd31dfe1d265340d7d7cd3525ba83724 Mon Sep 17 00:00:00 2001
From: Sandra Tobajas <sandra.tobajas@savoirfairelinux.com>
Date: Thu, 15 Oct 2020 14:48:34 -0400
Subject: [PATCH] packaging: raspbian: remove qemu-user binaries
As the packaging for raspbian platform does use the virtualization with
qemu in user mode, remove the qemu binaries in the build container.
Change-Id: Id72ca6bad3d47d525c3a7d0213d5fc5eebbaa3d4
---
docker/Dockerfile_raspbian_10_armhf | 4 ----
scripts/make-packaging-target.py | 2 --
2 files changed, 6 deletions(-)
diff --git a/docker/Dockerfile_raspbian_10_armhf b/docker/Dockerfile_raspbian_10_armhf
index 8072df25..44a6e26c 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 7b518895..310384e1 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
{
--
GitLab