From patchwork Tue Oct 31 14:43:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 739582 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1689679wrt; Tue, 31 Oct 2023 07:50:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxCyWr9osiSxc5ekYbexgptzW053ftY8fmYJJs+NDimvPLviaGgSnlsEhTi0hYHNSz9DDf X-Received: by 2002:ae9:f443:0:b0:76d:2725:f36f with SMTP id z3-20020ae9f443000000b0076d2725f36fmr12352423qkl.71.1698763819563; Tue, 31 Oct 2023 07:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763819; cv=none; d=google.com; s=arc-20160816; b=jTvUQjWeZnicMPyi1hW3Lp3x3naRutwN27Re99nOXmfCMYTYy6tO/vVGtMN6G6d72+ u1p8c+c+p1ep5admAj6teM5q12Nfv6B1Z97iewZ1rZ+kMYDhBWfgSOzhavLXQ25Zxzg0 8CsylxKfoyLekpYZZWEtrwpoJ8Iwq3bJB9OEVAIklo9M0O2FjVAVGs9DUq3N3oVpFxPj Hy5Wjtsdy7u6xH2NgezxV9GqHWsqkwrHyiT7BKR8UIoh3iNHEAU6bh4+0Hjko40eUemj HDKiFPCX+kv+AZEdi8I4r1bFoLU8QKb8cum+kxIuHfh+Fig/7BfZAycqtvr0fc7MVsdH T0Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ndIjKuvnqGHRvHRZNJZiZGvMt1TC/HbwEzRPVDvch8c=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=u2kJcYavXFRcaf4mhjH0b64ZL3MbBfyJhKAyoR9IgRYGLK7sWZJWf4pn6zxrPWsdbM lZGGTRz0hVWRq72XwdfxvUjUbjuoZHGwVG2Wknob3l9SwBwoUzcO5MKvuLEu+69f1VrS Uay6HRI61B+bvHZslJV1HElIRzb3eMu5MThw/GeWubIi3bqCF8wFV19Vbeqh5MEwjcNk RyrWFO9Qas2MWU6JgsnGa/C3n4hiyqPcaJclpO87CbGtAPh2gcW4Qoc+D4wOFu6z3vc/ 33riItZRPmmB/wZQAmhpvisiY2kK3ZUfojbpcwCHBoGhz8IPkOHizuJfUyf5Nuo4EMhc 6Y6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PD9YTCVT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f18-20020a05620a409200b00773d05a1403si1244996qko.542.2023.10.31.07.50.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:50:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PD9YTCVT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxpyZ-0004pV-9u; Tue, 31 Oct 2023 10:44:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxpyX-0004or-RI for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyV-00029y-6K for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40853c639abso44758205e9.0 for ; Tue, 31 Oct 2023 07:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763448; x=1699368248; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ndIjKuvnqGHRvHRZNJZiZGvMt1TC/HbwEzRPVDvch8c=; b=PD9YTCVTH/Q6MC+s7LGhcKuMOvaLV+HHqRxxlPYKuUjaG6RTxLC1bf//hmehw4uI+Y dQRqKMlyfMQQ8osMOuDytkOdRxlgQVX6K85vWEpST3vA4zs30uPP0yvemntxb02/e9Qg Sn2FAo3w9Mt4uvAxopngOk0I0EqUbsaH0JzrvqvMNb/Y+4TtshV4h+EtwUGW5Y3U7PxD jeFkwZdkB5aYhEQt30qEapeYDFcZO3Jsx+piE6wCPtghjOt9I0JEvJ26q1UkCE0LzQPJ 4CQHDw6vsNioVWallsCKB7Kse/O99SMqdpCCl3yT+hlp2f3wrkPhQFeZHtq3tRj85sMj QBUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763448; x=1699368248; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ndIjKuvnqGHRvHRZNJZiZGvMt1TC/HbwEzRPVDvch8c=; b=tr0bZpX7CV8yfM2P/+qLcX/y0bkMUOLkUpQ6FGG3vXuSRqrgbsbp51CzU7uxzS/0bD tTU47c80okCj4a7HE38sh33m3otLOaYL90MqhVqHmomQvJySAwOL/7i8u5cZ1yNb/+hc rXXtNWnTmf/xxmz5CJ2oFBKxsp/5R0brQ6PupkpfSDykwingASNlgHfvY9z78BOhKx0i LDX1dZHCxKP7ANSMz1X2OjW2Fn+O0F4dQTZkYIL/tcRDRKRuPmvaWjrV2x7JWUCtuvNj ckNHpmGgjjEi4f44Yp4sJ/oO6JargFBQDEGxlpXqpBSDRMgmbwHeiEDBHVhl74g63ntF prCw== X-Gm-Message-State: AOJu0Yw8pERP6g9U2+oKSPEiGi4sMl9+YjHc7QBoUDZv1P/tjPHIcukX FIHi0yzJz+2MF+C1KRGZEODT9g== X-Received: by 2002:a05:600c:1ca9:b0:403:9b7:a720 with SMTP id k41-20020a05600c1ca900b0040309b7a720mr11482656wms.1.1698763448125; Tue, 31 Oct 2023 07:44:08 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h10-20020a05600c350a00b004064cd71aa8sm1964851wmq.34.2023.10.31.07.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BF1EF65711; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 10/19] tests/docker: use debian-all-test-cross for m68k Date: Tue, 31 Oct 2023 14:43:52 +0000 Message-Id: <20231031144401.1238210-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-11-alex.bennee@linaro.org> diff --git a/configure b/configure index be7cfeddc0..aa29cfb797 100755 --- a/configure +++ b/configure @@ -1313,6 +1313,11 @@ probe_target_compiler() { container_image=debian-loongarch-cross container_cross_prefix=loongarch64-unknown-linux-gnu- ;; + m68k) + container_image=debian-all-test-cross + container_cross_prefix=m68k-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc + ;; microblaze) container_image=debian-microblaze-cross container_cross_prefix=microblaze-linux-musl- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 66b8844246..d42d89b26e 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -46,12 +46,6 @@ loongarch-debian-cross-container: variables: NAME: debian-loongarch-cross -m68k-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-m68k-cross - mips64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 47e58a248e..fb93eca537 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -122,7 +122,7 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # These images may be good enough for building tests but not for test builds -DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross +DOCKER_PARTIAL_IMAGES += debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker deleted file mode 100644 index 25dd1c1e68..0000000000 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-m68k-linux-gnu \ - libc6-dev-m68k-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi