From nobody Wed Nov 5 08:24:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153061387407987.58566157429436; Tue, 3 Jul 2018 03:31:14 -0700 (PDT) Received: from localhost ([::1]:39442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIaX-0002sV-9S for importer@patchew.org; Tue, 03 Jul 2018 06:31:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISo-0004Z7-QS for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISn-0004Xz-9p for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:14 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:53653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISn-0004Xl-1X for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:13 -0400 Received: by mail-wm0-x241.google.com with SMTP id b188-v6so1732949wme.3 for ; Tue, 03 Jul 2018 03:23:12 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x15-v6sm1453932wme.24.2018.07.03.03.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 244B53E0B6C; Tue, 3 Jul 2018 11:14:46 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1TZ8UFL28lYw7e8FtBRDZ3v7mzvmort2kp3kI1KhBj4=; b=RlAUCNTWvCvOHcxv2kPkpKhCPqHsma00qO8iC5ulN8R0G6c9Wkqbk/LNDTd0428rok x87nsVqgmw/ncOdkyZ7gXIGkJ+btiWvYKlevt9SYSGiEWaSD8W54XylegGBVu84pzrX0 7IJD6OGIQlF43whFyleREJTR8ebcsXEpMo4u8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1TZ8UFL28lYw7e8FtBRDZ3v7mzvmort2kp3kI1KhBj4=; b=Y6PMQ6av6iqNGLcOxq0/vHSKc33ZdeVG6QkVMWEpygcDigDqk4kuvmyEHjRgyXLqjG GWLIsnGZUHxhuVpLylW9/ZV+P/IeHVPN/McfbOV6nW/foix+o8XZaNoY+ulXegmHKPOk nFzaHGchZyQLj2F/sOmQSfubzT1RDG6upp/RyPkBOHzdIisEfgnxCl8GWfuuSaNT7ird bWv//nnYT4q3k52R0U1fmQQL0flcPZFn849ezzQuZf6JYY8oJRjTwLVOFZHp28zTzEgJ P3vXYtlzPWeTxDsRzZrotXFWVpEaiYIbQSfAH8DCjGFbCu+OmworWOURDAUXCxhOsWXt qEkg== X-Gm-Message-State: APt69E3gamP0HHoguzyp7dWW9LQR0yiaOFFqebJARrJsCQgWR9KzPeIl O6ghNckxZzbGQQjdp3uGMYY0hqIGR+g= X-Google-Smtp-Source: AAOMgpdhqYHCDCytIvqs4QVl9BRSm3ul492p/V1+TSQgCMYqZ4HZn6eqM/0jXAARjD3B33xAuDK3Ww== X-Received: by 2002:a1c:e8c:: with SMTP id 134-v6mr10792960wmo.51.1530613391913; Tue, 03 Jul 2018 03:23:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:44 +0100 Message-Id: <20180703101444.23778-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 20/20] docker: add linux-user powered cross builder for QEMU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We can't use cross compilers in the current Debian stable and Debian sid is sketchy as hell. So for powerpc fall back to dog-fooding our own linux-user to do the build. As we can only build the base image with a suitably configured source tree we fall back to checking for its existence when we can't build it from scratch. However this does mean you don't have to keep a static powerpc-linux-user in your active configuration just to update the cross build image. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d43af0db32..12852ebbc4 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -121,6 +121,32 @@ docker-image-travis: NOUSER=3D1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 =20 +# Rules for building linux-user powered images +# +# These are slower than using native cross compiler setups but can +# work around issues with poorly working multi-arch systems and broken +# packages. + +ifeq ($(filter ppc-linux-user,$(TARGET_LIST))$(CONFIG_STATIC),ppc-linux-us= ery) +# Jessie is the last supported release for powerpc, but multi-arch is +# broken so we need a qemu-linux-user for this target +docker-binfmt-image-debian-powerpc-user: DEB_ARCH =3D powerpc +docker-binfmt-image-debian-powerpc-user: DEB_TYPE =3D jessie +docker-binfmt-image-debian-powerpc-user: EXECUTABLE =3D ${BUILD_DIR}/ppc-l= inux-user/qemu-ppc +DOCKER_USER_IMAGES +=3D debian-powerpc-user +else +docker-binfmt-image-debian-powerpc-user: + $(if,$(call quiet-command, \ + $(DOCKER_SCRIPT) check --quiet qemu:debian-powerpc-user \ + $(DOCKER_FILES_DIR)/debian-bootstrap.docker, \ + "CHECK", "debian-powerpc-user exists"),\ + $(error To build $@ you need a --static ppc-linux-user and configured bi= nfmt_misc setup)) +endif + +# We build the QEMU compiler environment on top of the base image +docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc= -user + + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(= DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ @@ -156,6 +182,11 @@ docker: @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' +ifneq ($(DOCKER_USER_IMAGES),) + @echo + @echo 'Available linux-user images (docker-binfmt-image-debian-%):' + @echo ' $(DOCKER_USER_IMAGES)' +endif @echo @echo 'Available tests:' @echo ' $(DOCKER_TESTS)' diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker b/te= sts/docker/dockerfiles/debian-powerpc-user-cross.docker new file mode 100644 index 0000000000..6938a845ee --- /dev/null +++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker @@ -0,0 +1,15 @@ +# +# Docker powerpc cross-compiler target for QEMU +# +# We can't use current Debian stable cross-compilers to build powerpc +# as it has been dropped as a release architecture. Using Debian Sid +# is just far too sketchy a build environment. This leaves us the +# final option of using linux-user. This image is based of the +# debootstrapped qemu:debian-powerpc-user but doesn't need any extra +# magic once it is setup. +# +FROM qemu:debian-powerpc-user + +RUN echo man-db man-db/auto-update boolean false | debconf-set-selections +RUN apt-get update && \ + DEBIAN_FRONTEND=3Dnoninteractive apt-get build-dep -yy qemu --=20 2.17.1