From patchwork Sun Oct 29 14:50:26 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: 739058 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp743048wrt; Sun, 29 Oct 2023 07:53:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/ckVrgRWUh/l6fusaidGjSsl0EOd2OG2nndtD2ZpXAKtHIOB0JN8N+M1Rj6rspwDo89kD X-Received: by 2002:a05:620a:2ae9:b0:77a:1476:fb93 with SMTP id bn41-20020a05620a2ae900b0077a1476fb93mr6323379qkb.47.1698591206174; Sun, 29 Oct 2023 07:53:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698591206; cv=none; d=google.com; s=arc-20160816; b=ROyDVxEpJe0FaxRMWknGD+lUt33GMVzy3Ri28fIDcHF7h1EU+etNPRIJV/g/Z5EG8P DOokkhCYQ2XbK6djQAyX32vyzHmnYiuVLFGFLvu4RuwVLWIy2Uad06dWAOhEGxvd/aBt EcLSey3v0KniCZiI4mNh8l7jdSyLEUALpb2AtHNxiluNDl1ee/UujVr7cTI+aPkKPTkT punBi9c1w1YV9Umy3PfpX3Z9lJFBNAVIkCYD7YhTCR406PK5lhF9faSxlqzvqdgjXLVn Wh+Pe/cYIqfBM5xcSb6DLLdh3JhRDIntWutLya+ygE5weD89p8Uy75KuDv8VFhhCClkV EqPg== 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=EGe9/RdkKEwfxEpscY//8qq4WIHN5v1YsW52fWPOhUE=; fh=xfTKN0dOWXSBe88Qf19pDztkyZ/4+zDTR3+/QiZRr4s=; b=sJzbEjMHgUOX4uG0fWn6qmFswRb06m1uhv7SCvQBxN7+dv4/XfZ4YPDWSGHvl8mTio FBztI+oWY73rmHVwzEsK4fDnD6RcSvCJIS4lufWJObGl1Ve5sXZLUrJtWYTMqnmnBewF Af0R+gnoizVWnD7ZoWcf3lJN8lXJbaVGsUU4MTJ7lYjJ1/sf10SmXXpWpLZME0abmlpy 1mxrG1aiFpHBXITWcxCMqmf1Cti01gfeNQgWGijjvNY2CFF61FbUAAoK3ukrWl4zYcs3 /v4hxGb70givaD28W4xq+lF18ePDnX9uV2VHfkSgMpRIGTulEoXWs761dn6uH1+MgKJr xGHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M2QmmXc+; 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 q6-20020a05620a024600b0077419b27782si3979025qkn.339.2023.10.29.07.53.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2023 07:53:26 -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=M2QmmXc+; 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 1qx77s-0007cR-Le; Sun, 29 Oct 2023 10:50:52 -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 1qx77n-0007Up-3c for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:47 -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 1qx77i-00057u-4o for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:46 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4084b0223ccso28665835e9.2 for ; Sun, 29 Oct 2023 07:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698591041; x=1699195841; 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=EGe9/RdkKEwfxEpscY//8qq4WIHN5v1YsW52fWPOhUE=; b=M2QmmXc+cL1JMD4O5wz5mmQV+++RFdHNuCXbF+Ja3c3ejOk1co+qRev4ZacK/nSknv l3qSZwDkv7UrMT+s9hfxbuNuBK4GzCWjBEKxINhIEHmZkSOC/DayYTd3tLg9tCUq5qOd WAg0gDjGgBOWy9cUTZYpS0onwIOUVup4Y9KoO3BkLSKuT0YzrNmsyXAWtUzx7Xw5kxnL QVi0VtjyygctNz9zU/WsWU3I67uAH3j+7Hsq4mW9nb6tSxg3BIt+uAeUGQMYqlBo3Ep7 z8fvJXOSz9bT5+MohUf2W///T8w6cc7YmFJd431dUFQhP3GUctOMcQW5xP83QprtPdaE /gLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698591041; x=1699195841; 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=EGe9/RdkKEwfxEpscY//8qq4WIHN5v1YsW52fWPOhUE=; b=kAP5yga+PoPSHmSI2aRNprgvDhSbPEhKiiYjAI0Cw+BzJSXGqamLJCXKYYJm22jGB8 wHy7EoGzvZgwoaS/LlOVsghdaJ3PYbO4kzlBEq+lpEvXVNS0RLCcG1x7sKNUfPPobfbY H6ExW72KDs0lNTbdqnqt/BYdxvmDwUDFoS7t0yJ/zQR54LsUBksccG7+Lq23kBaCtsG2 M+nI3m+toKmIkQUntphXcYsrpIi46e3WFkeojJ4tp5rsLnfOfAV3FY7topZmaeINgaW4 edwsQXwDnh3OaQ7EKhDpiK/RYpLsa87WFtUb19RN94oobs5jewEEEHrFtvbWMFQcucxf Mk2Q== X-Gm-Message-State: AOJu0YzgzyNg3bIhdmnqACOOB2xsGgk8VpGwzRGfKSsncCTrqjK0wiRS TbxsUnW2DZZBOG1oQbJ/OdExnA== X-Received: by 2002:a05:600c:19cc:b0:406:8494:f684 with SMTP id u12-20020a05600c19cc00b004068494f684mr5691589wmq.23.1698591040561; Sun, 29 Oct 2023 07:50:40 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j15-20020a05600c130f00b003fbe4cecc3bsm10080311wmf.16.2023.10.29.07.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 07:50:36 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 427B0656E3; Sun, 29 Oct 2023 14:50:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Mahmoud Mandour , Wainer dos Santos Moschetta , Brad Smith , Aleksandar Rikalo , Kyle Evans , Aurelien Jarno , Jiaxun Yang , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Warner Losh , "Edgar E. Iglesias" , Eduardo Habkost , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Brian Cain , Alexandre Iooss Subject: [PATCH v2 12/19] tests/docker: use debian-all-test-cross for mips Date: Sun, 29 Oct 2023 14:50:26 +0000 Message-Id: <20231029145033.592566-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231029145033.592566-1-alex.bennee@linaro.org> References: <20231029145033.592566-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 autolearn=unavailable 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: <20231028103311.347104-11-alex.bennee@linaro.org> --- 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 df5eb3ccb6..053330d6f4 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -52,12 +52,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 5831744a39..dfa9617bb9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -123,7 +123,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-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