From patchwork Sat Oct 28 10:33:01 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: 738935 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301598wrt; Sat, 28 Oct 2023 03:35:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5iu6BSAcxeGZwQQKZ1A5vadG0sC/OJmEm1Ml/wdifXsaj7Aq44k37JfynawfEts9dp0fY X-Received: by 2002:a05:620a:1a26:b0:778:ac69:edf1 with SMTP id bk38-20020a05620a1a2600b00778ac69edf1mr6458632qkb.36.1698489346027; Sat, 28 Oct 2023 03:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489346; cv=none; d=google.com; s=arc-20160816; b=EvA4z6u1fo1VTJEdbSSNoJm2nAoyo5kj5aoECVK4xiaqTLwKk3H7aI9BEfPkq4fJeW BujdBSx4lBgl2XE8Zd3wCn0VcnLi3QQtH6CIKgxNmwn7kT4b3mRF5TN/yo7Vp/HMsgtj yPz9iuD/PIYZM2gOIjaHau09gXiDRi0rTtwKCxUM9EMCCgm6lPhLsfYIrfI2CHrd08Fg 3AE8xdNUi0P2H7k6QzmeefxIawU1fIY6+MgXOzpuFZeyz70y1lcazjH3hZk4ncc6Bx5O MvALIKta38M6ks/hw0UEC9tAglKTpwPOA8FyYSYnjyI2BoqerlwNQi5+7YEUEBi5wvOc Q1gA== 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=UVrvJytMOgZkGMhe/n/Zc67wTMwGK+JIiWzg5lM004g=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=wQ4mxhkGXRV+4BKhCts1YVZAHyCnUyn66tY8JptROLhxIJwPbIXI46Q33PDMykQU2E QNAelaWE/63f9WKBdIEzdrIro7mILTOoVy28wIv4ZbpTBhYdFuHDbTEm7PCLSWwT1yLh jpkkiaBxJzPchpRpgfM4pI9BDAcN/mGzD39irJqd5P68RzJsTjgMPNPK3anbCwA7uXS5 Qk1IyyIuQQh+AZbduqVf5L7nuDHIcmMkh/Pj9Y+HmPgq7pEjJzh30oqYzL2rzfGL2X9J Qfx96cGOD4JI2YGdcS6U533CcdccLUbZBcOzRFPH+wygJY8LCsnsfGibrHm+ma365tH0 /GVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FMTBWw5J; 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 27-20020a05620a049b00b007706544a3a7si1997226qkr.673.2023.10.28.03.35.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:35:46 -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=FMTBWw5J; 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 1qwgdD-0006C5-FL; Sat, 28 Oct 2023 06:33:27 -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 1qwgdA-000699-1d for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:24 -0400 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd5-00039m-Tr for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:23 -0400 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2c50ec238aeso40622541fa.0 for ; Sat, 28 Oct 2023 03:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489196; x=1699093996; 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=UVrvJytMOgZkGMhe/n/Zc67wTMwGK+JIiWzg5lM004g=; b=FMTBWw5JsqIg5OwoAZ/ljlwelyOBKa4rK5BZpOYI+jvuVdpvfFJSu0MTnmj0Ws6kHR vS8MgzOg2tJuI7nPHaTlPoSTeN33Pn7o352Q9lSVqV3XHxpEW09y2Y8PDUY+naYgzMND irsPYHE4L7uYy3oc6LX3Vt2awxE08GQLZjxtma+gu68EYod9EcrtOf9mmDu3MsNBUIXI VTpkcBJq7Vqu/6UmrZ/li5eCjvEGG8e9H6b0n6juDYFN4rzlRBQF6NDRoUS2LddrkEJ9 SH3wxSoR3MWwC48QVK7ov/VTg+MSuiFKkIVTHuT1hxTVp3yY2zjQSTxDKmLHaP8SYclC KVFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489196; x=1699093996; 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=UVrvJytMOgZkGMhe/n/Zc67wTMwGK+JIiWzg5lM004g=; b=HDaQNAtzMy3CZFUSj/VuFPAx1ZGN+YnNJVpe/9166asS3rsFHAjghRrPS6/qU2SOtV DWX8bsGmNCGfZ7eGGmNXa7EVA4M91n1hs7i7D6TJvhHDGIOEQGbMQi1KP1M87BZp0Yti Q3DJiAWF0kGX7VFzGCmQMzCaazuXI4tBUpooWhwWXCIw70EsYSUMZXNsKq2ooSN63cQi bEEQle9iKLtbaoBwVgdqFCUN2yTxWxwpOpDUypMK+GfR+QE7vAleonSRbyrx8gAyAtj1 HPidDKx+Oeux9afSdPwK7P3KpW/qikSj0EolwSPKbb6bCjx/hpRTMxR+5AfK1un3Exao +mHg== X-Gm-Message-State: AOJu0YzuV5JuR6Fv5MeeZWP07PpxQpyR1/eAA/EZg1Q2JyW9VCwiavRH CPNAyHqAdxzB9VXagMDNEi603g== X-Received: by 2002:a2e:9a86:0:b0:2bd:180d:67b1 with SMTP id p6-20020a2e9a86000000b002bd180d67b1mr3908833lji.51.1698489196532; Sat, 28 Oct 2023 03:33:16 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m9-20020adfe949000000b0032196c508e3sm3582913wrn.53.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 AE4D45F79F; Sat, 28 Oct 2023 11:33:12 +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 07/17] tests/docker: use debian-all-test-cross for hppa Date: Sat, 28 Oct 2023 11:33:01 +0100 Message-Id: <20231028103311.347104-8-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::230; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x230.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. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 5 +++++ .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-hppa-cross.docker | 19 ------------------- 4 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-hppa-cross.docker diff --git a/configure b/configure index 8707bd2e78..0a755c71a0 100755 --- a/configure +++ b/configure @@ -1300,6 +1300,11 @@ probe_target_compiler() { container_cross_prefix=hexagon-unknown-linux-musl- container_cross_cc=${container_cross_prefix}clang ;; + hppa) + container_image=debian-all-test-cross + container_cross_prefix=hppa-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc + ;; i386) container_image=fedora-i386-cross container_cross_prefix= diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index ec56990bc5..5f8616c0fd 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -40,12 +40,6 @@ hexagon-cross-container: variables: NAME: debian-hexagon-cross -hppa-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-hppa-cross - m68k-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 356986d687..b701f1225a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -122,7 +122,6 @@ 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-hppa-cross DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker deleted file mode 100644 index dd47ffdfa4..0000000000 --- a/tests/docker/dockerfiles/debian-hppa-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-hppa-linux-gnu \ - libc6-dev-hppa-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