From patchwork Tue Oct 31 14:43:51 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: 739581 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1689228wrt; Tue, 31 Oct 2023 07:49:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEEk0/eKOq1CPXjReG9eWKEfKdX1/FKdSIOUfhzY/4VRvSJI+FcItjBkYEJO0W1h+nEEfbX X-Received: by 2002:a05:620a:d8a:b0:778:9ac2:5a9f with SMTP id q10-20020a05620a0d8a00b007789ac25a9fmr14184945qkl.11.1698763757170; Tue, 31 Oct 2023 07:49:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763757; cv=none; d=google.com; s=arc-20160816; b=SGqwx6rqmnp4Fm3NsZonNSmoeEoN1b/8ON6t/oW+EOBNS+GvJaFY/+/JcdnyizxS9f 2QAaHwG5kbuYaCJq4B1btKMukfKZ2weDC/F76QBLQCxP1mYjf5FRyf/kyUE4Uf0G6cIc RdZF1hyAJ3mRbOTp42RGnCTEMaYkykWF21hj5Uerjq4oWA6FQnTsBjNq2yrDclfl0Eo6 S7wBFyHKs4DbPNQBzt32JY2XV0T1cob8MnkKxGklTRa+9CK2YJCIfZVwxctDZaTsT5s4 Nb3Tn8ZfcTUoDzmYpUk8613nRljBeMzBRvvYZgbKPJGWReNTrrc+cgcoW4b6+nCHSd25 nXAw== 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=U30BBgxZL0E6bzjBTiHhMCHKRVxI3F7Um9iUKr2Sfcw=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=BcC4wdP+2mRzW6iYyF2xumy+/6KndhDhyyhIjVbVZExqC1qVti5wOpYmuMoucfOPBX s+4saPe2A/TUfVMPdh2ZBNZgS0gKbarA8znEHD+2TC+kOHFmubvfTgNyzV7P/dPM/u6/ t5WHIlY1Sv1ramEZvFIgHpvzHH76Aw+Q3DZTunCS7DnL1bTkS43MvD/YthcbMvSpWH64 TInHmqLcFZuwH0+epa3OURt98scB1+oYGWblB3Yva39Wjlx/3jSOcgVw8/waoZ7PumGp jvmAnv+zlnp6cxbjqtbAKjA7BLtDAtPRmzXI7Vh2mxD+MaCMaQC7mjj47/xxsLT6JJOs 8qfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xNQwTzYF; 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 s13-20020a05620a0bcd00b007788fb75a90si1230157qki.620.2023.10.31.07.49.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:49:17 -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=xNQwTzYF; 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-0004pq-Lk; 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 1qxpyY-0004pK-FM for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:14 -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 1qxpyW-0002Ao-Jd for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:14 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-407c3adef8eso47171715e9.2 for ; Tue, 31 Oct 2023 07:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763451; x=1699368251; 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=U30BBgxZL0E6bzjBTiHhMCHKRVxI3F7Um9iUKr2Sfcw=; b=xNQwTzYF79eXfiA90NirFxigbdmmtdvTlXXe98Fvg6LZXPtVtpU9at8SC6cimkMfR5 axeaT6A07AFRj1+HPVwCHbJWGTu4Wk18HpPQhF+xyMX6ze/E8Atp2x9KInBnM25n45uR UO6B3AlebPV0L50hwJ4h/heesiNtRHJh82iSbJdjZGhsB9uQFxeRi5vIXXjq2FH3sQLw F77JDov1vX9uL61UZhYvdd3i2TDgq2VfkMFH8LxGyWNnh7PvMsUPITHH8cnrVy2dXkI+ uDbwSgHW317EB9LQNpIHlMBJ6Fw3fY+Nqme0mJ9h+3X3EXv2z1c0EXDwvOaJ+dn6AeH2 uNzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763451; x=1699368251; 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=U30BBgxZL0E6bzjBTiHhMCHKRVxI3F7Um9iUKr2Sfcw=; b=ahH3ZeJXCe+DHSXOG3NL0pOV2ouPEFMp0pRuGI2BOXsjf3+5uHzp091QH+/xyQNtej RKKIf7I0DWFrevFXmvBne6vtY4XawJ8IUHILnriLlpoZwj6mALFnJSVT+VmItoCCglR7 6iHI/l7dEHQgkTvtqA2sicJzKc+1YcA4I7yKJduYarRb8MHPsVq5Z0EUh8Lk9vFF0wjY 3XGequYDmYetMYkzys9BYJvf2+e2SDZ4b05L01bE5diBAkYTjX451UJitqenb6+c9p3M S4dLSI94vhTx61iz7krJTqoGJy29LYybR35bNauNEHsucARlLIQF90gQYfnDEalN+SM1 7qug== X-Gm-Message-State: AOJu0Ywz0+SqmExABB4xqR3t1IfU1NV+pEYU9G9RN3nYfCpG3+lQBAE+ PNKoADclZiOLYqAfxIAKzXTY6A== X-Received: by 2002:a5d:4390:0:b0:32d:81b5:82d0 with SMTP id i16-20020a5d4390000000b0032d81b582d0mr8624104wrq.33.1698763451078; Tue, 31 Oct 2023 07:44:11 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f7-20020a056000128700b003232f167df5sm1639943wrx.108.2023.10.31.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A87E36572B; 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 09/19] tests/docker: use debian-all-test-cross for hppa Date: Tue, 31 Oct 2023 14:43:51 +0000 Message-Id: <20231031144401.1238210-10-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-10-alex.bennee@linaro.org> diff --git a/configure b/configure index 96b01a280c..be7cfeddc0 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 a1dac0a45f..66b8844246 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 - loongarch-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 82e06d84b3..47e58a248e 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-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-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