From patchwork Sat Oct 28 10:33:04 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: 738929 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301246wrt; Sat, 28 Oct 2023 03:34:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFWqisQ8KqykVgg3M2BwAOnIe1mK5bU11rGItZgZd/Tbtj9pU+sQj86qkkjpuVC0oTGk+KS X-Received: by 2002:a05:6214:c44:b0:630:7d0:56f4 with SMTP id r4-20020a0562140c4400b0063007d056f4mr5367682qvj.49.1698489281816; Sat, 28 Oct 2023 03:34:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489281; cv=none; d=google.com; s=arc-20160816; b=VfmchgKcXty9ZzIattjA8Ota18KcbXvrrpFvScT3iM6E+TuUt5trdr6WVHifZyWHtf tTy0/irL2RSwCpIx9bTDmhvVqeur0bzXwUwFxzeHwDjQCf2guiuIWTzUIqlTw4UVuYPp ZHp0ZJDGt1RMsWoPOaigoxnLFYcWlkSJ6T0kDjvq6VtykZShtmzp+ZNE4YLtfpgcX9BK PEkA08bRjLd4VI6FSj35V4jF5LElHms3GM7DCgkcK5HOb9pyjdXa59iD5mLQlxLxadDf SUKTVIa/zCIRgmOCo1vWe57T2khVvK8cqACNHXPOitoXanFu9aRpYObDmr9RStC0OCGi LAwQ== 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=khcpUjuKXbYxxFjA3ukw68hKA66dopuVKXv6uOwtSmY=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=nZmf3viKKjbROH1NQXuZH7CH8Yx7q+uneQD9240vbkAMnGrp9KdeSZ744ollYFaG2J /WGJ4zmB7wIlkHf+Vu3910a147QgrL1o0eLvoDBHuL/uV/VhMNI1a678o44kMzkL+6Fl qTNdMOq2xi2eNuUYew4OOSwjYq39K0X6AaeQApHXBwxQ4WAaUhjzj8tdhuHo8s8jf1U/ 9wJ0M0Jsfzvqd+C5tn/O5C3+5/5Ct0Zni5zNng1xEDGk7Xr6G+HyJQ6ji5yp5ahcBFMI t2eISFF/licwpmy9FW3VgiHoHdFRTvULOxptDv+7Ch++dozuT7ywInUxFuOgSlsnvMYa r2tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vQAxeUAo; 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 b8-20020a0ce888000000b00670c3758754si814324qvo.314.2023.10.28.03.34.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:34:41 -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=vQAxeUAo; 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 1qwgdF-0006Fr-Pp; Sat, 28 Oct 2023 06:33:29 -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 1qwgdD-0006Bn-86 for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:27 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd6-0003A3-8H for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:26 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40806e4106dso16742165e9.1 for ; Sat, 28 Oct 2023 03:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489198; x=1699093998; 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=khcpUjuKXbYxxFjA3ukw68hKA66dopuVKXv6uOwtSmY=; b=vQAxeUAozVx5jOdQRpGKKizaQ+GZ7zSu+uCsc+grWeJJNzBYqoiq9fvmc6jS7RiCs6 9GHJUQHOy/9hsE+th54XWOKTWGi1ahU+c0x8xPxR0lrsFuyZxy+/zM7lal4eO5x+lnow VjBWvBxBAcptyACAzsqEGzVLyHsJQaMu2UKyHFc0i0I7ltc+t9w3HgiIuI1hlEPNUgas dYfjOOxIZUO+ObOFgZyuSvWlFkHRCp80emt5/kYx7Gg7IBh/KCEF/FXuA7pLTv+mXwbZ Ufq9W7N+ZxeoefrkO7Kv0OugWZ5DGm4h0v34MymYBeEfVuaD4VKYyv21jlq/9YrqQ2f4 Yzpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489198; x=1699093998; 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=khcpUjuKXbYxxFjA3ukw68hKA66dopuVKXv6uOwtSmY=; b=Aq/YtlyHn8KlzWXXheFhN41jxN6ObVnlsVxiiWP2KtJx/v0jhLOg7wwrET5Qfj8+qm x3hHRyKpvyXgvD9hFcCE15C7Zse66K/4b6E5Mn9aONVyANAU+G4+KMkUn1TX4Ne7P6Er +ts0w8SeqM61xWPyyww86FCtZ75OA5CnNn8mCCrt2Okev4Xjv9iEqYkwQdw0G9hVYFbv 3fLAxONjunWQUqLXTALw4dYu9jEPQBK3YA3vnuPbcoptMkvbDJFYh8W/OEseV677Tmpb TAlDfLzKIUgKv3jaUQNS9FbnSlXVyj4tJMUmLQz7he3ealXwu9A+/zjIjCMSBUEsRsjI IONQ== X-Gm-Message-State: AOJu0YyNYXPXFCQ6nUjivHBWXxLGN7mu6x9lJzLzp2C1StsVXqctwFGv Nre44UaKLFdm08p6CJn0Qfra4w== X-Received: by 2002:a05:600c:3b9a:b0:401:b92f:eec5 with SMTP id n26-20020a05600c3b9a00b00401b92feec5mr9092107wms.9.1698489197941; Sat, 28 Oct 2023 03:33:17 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h9-20020adfe989000000b003271be8440csm3548603wrm.101.2023.10.28.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 05B3B5F797; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 10/17] tests/docker: use debian-all-test-cross for mips Date: Sat, 28 Oct 2023 11:33:04 +0100 Message-Id: <20231028103311.347104-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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 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. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 4 ++++ .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-mips-cross.docker | 19 ------------------- 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-mips-cross.docker diff --git a/configure b/configure index 2bcbf0fc36..2d8c7a0312 100755 --- a/configure +++ b/configure @@ -1330,6 +1330,10 @@ probe_target_compiler() { container_image=debian-all-test-cross container_cross_prefix=mips64-linux-gnuabi64- ;; + mips) + container_image=debian-all-test-cross + container_cross_prefix=mips-linux-gnu- + ;; nios2) container_image=debian-nios2-cross container_cross_prefix=nios2-linux-gnu- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index f863a14664..0b48bf0172 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -46,12 +46,6 @@ mips64el-debian-cross-container: variables: NAME: debian-mips64el-cross -mips-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-mips-cross - mipsel-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b4296d3c5e..04ac5f9c79 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -124,7 +124,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross -DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sparc64-cross diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker deleted file mode 100644 index 2cbc568ed1..0000000000 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker mips 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-mips-linux-gnu \ - libc6-dev-mips-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