From patchwork Mon Jul 19 21:48:25 2021 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: 480066 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4522992jao; Mon, 19 Jul 2021 14:50:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY5/IXH/S+sUF4sC6o/ZsabSjIB5Nu9baEpoFk4xYnb5QNMhB0uRBC2WrXDMo33GLr/mDa X-Received: by 2002:a25:7316:: with SMTP id o22mr34420353ybc.349.1626731459400; Mon, 19 Jul 2021 14:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626731459; cv=none; d=google.com; s=arc-20160816; b=Rhi83Ml6bBr8ahvbaCbzxSJxVspRhntlkf1yTEZlseqC54Cj45vOakqs2mE+0MyRAN V5DdZehu71ecjHVUt8RVvuOTc9i+UJeO9vbHGdQMrS6QTyvRbFJ1BDwPhcFUey1psOZz p/Pd7NFc2sxYkO0mSjiSggMPXcHCk8GpdQVD4bNgrNlCATvOVC3yI00xQObYdgSXlsAJ xX+1N9nZ8djlcymgRIpxmawcrUrOlNg6KxY2HRQJNQCMwGjhVHmlcMyHoUhWttgj2d2k pDaYL3r2+4kiDHogS1AKw6LZrWv1+okj58lb+b4V6XN9CR1jq9K4W8wUg52yr/AS0hrJ sezg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=UBpUNb+L8NMOfcLq0OwesI4pAHCDtHwuC35PJMpv0y8=; b=ES8qHQrf4piiLrsgCBfmRfPsvA/BOulu+EzP40i2EBvYlUqItqxisCStMiVR0MhCGq 4O9MU9IYAseEUNyZ+IcbSbNZN9r0bkGUjo/eLrIMGqifnPWsd2PqguppTo2PoI9ooHOf GZMrjuVa0qbp8zaYBWyax2rCH8Zj9JLNbjvihUyoxnjaRwJvyHWA++7DAHYLmxZFWqxk GYYOqg8nxam0kSUy8nQ28wWBBDUFRRJOOswuVQEVnd398tsGSbE5md1aa+r5DaVDxkDB FbPRTVTHrbhUMb2ljHWgaM8aBV12MmUwj0GxRTwZhlF3ZDKTtve9wN7hUaEJmKTca/M+ ScQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tdClvLvE; 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=fail (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 f36si19799881ybi.290.2021.07.19.14.50.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jul 2021 14:50:59 -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=fail header.i=@linaro.org header.s=google header.b=tdClvLvE; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5bAA-0000fM-T1 for patch@linaro.org; Mon, 19 Jul 2021 17:50:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5b7q-0005wC-2u for qemu-devel@nongnu.org; Mon, 19 Jul 2021 17:48:34 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:33297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5b7o-0000bg-EY for qemu-devel@nongnu.org; Mon, 19 Jul 2021 17:48:33 -0400 Received: by mail-wm1-x332.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso680396wme.0 for ; Mon, 19 Jul 2021 14:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UBpUNb+L8NMOfcLq0OwesI4pAHCDtHwuC35PJMpv0y8=; b=tdClvLvEte4+A3f/7IkJZQZLO86+xGvyxNSkSyPap5pLwb4VmmEWeJuuOTBOtpCuq/ wYLCWuuqjIUJr2Mw/rtyTC6wODfUXjppaOZUDonppzBr5U0CZry1MIeKlfJwIPaz/4D6 hmZUsz57LM7V7Z5zevUS+yQfWIetTg/CidurkXi9wH+QUikQCfR8fMnkAUqFi2inXjOe 5Y3cPK0euNh1ZoV78tQNK1pyhl0mWgFwgYJ2FjU9nnRIhC2rlN8IgrUkVDcbcvWGBttI butuWARGcr81WYGULoXKSz2PaVWFEwnwtpSnCmMdj3kIyMIT622pXpbiRfa2lRyX9H1z 22gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UBpUNb+L8NMOfcLq0OwesI4pAHCDtHwuC35PJMpv0y8=; b=uTF/xFG8NNbjFT/IdCLgYjwpQRscPfRCjOG7wP4XwMeIWsM4pE/DYn9TIA6AYpjbpY q86Txzl3rFPG5bMrXX66YjbK/KlQfRmvnNYEit/y3oQS0i4tmz9aydvRgwnGuU7gigDh pY64avtYC9PHiHY+MWj6ZgkBkxXZxTWhfvwHLr9zKdwQZ4KBRh/GHQK63vNmF/hzoDEC QzziFwWS3ckN//hkCVggzDh4ciZ0zUEm4+Srl9LASxzhapplzmo0qDbR8stSUpxCD1Ak B+p7VrHThfVGyFJ/n1lHtxKfK2AvESU0Kyw0GkMGk+npwpTdJxO098Ci+nP1wX4/dclc hZGQ== X-Gm-Message-State: AOAM530/Iq+BKN4qGvsF/QLRsxs8qebTtfZcD9rPdaLf/ubUQ+Epj0I8 7gEHPLGEyDBDx3K3wsMt3ipYCw== X-Received: by 2002:a05:600c:4f12:: with SMTP id l18mr20708469wmq.22.1626731310855; Mon, 19 Jul 2021 14:48:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o19sm9148638wmr.18.2021.07.19.14.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 14:48:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CDB0D1FF8C; Mon, 19 Jul 2021 22:48:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] gitlab: enable a very minimal build with the tricore container Date: Mon, 19 Jul 2021 22:48:25 +0100 Message-Id: <20210719214825.2264-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210719214825.2264-1-alex.bennee@linaro.org> References: <20210719214825.2264-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Willian Rampazzo , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We do the same thing as hexagon and do a two stage build that provides the minimal dependencies to build qemu-tricore-system and its check-tcg tests. Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest.yml | 11 +++++ .../dockerfiles/debian-tricore-cross.docker | 40 ++++++++++++++++--- 2 files changed, 46 insertions(+), 5 deletions(-) -- 2.32.0.264.g75ae10bc75 diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 89df51517c..5198b79deb 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -354,6 +354,17 @@ build-some-softmmu: TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu MAKE_CHECK_ARGS: check-tcg +# We build tricore in a very minimal tricore only container +build-tricore-softmmu: + extends: .native_build_job_template + needs: + job: tricore-debian-cross-container + variables: + IMAGE: debian-tricore-cross + CONFIGURE_ARGS: --disable-tools --enable-debug + TARGETS: tricore-softmmu + MAKE_CHECK_ARGS: check-tcg + clang-system: extends: .native_build_job_template needs: diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 985925134c..4ea9112289 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -15,9 +15,39 @@ RUN git clone --single-branch \ https://github.com/bkoppelmann/tricore-binutils.git \ /usr/src/binutils && \ cd /usr/src/binutils && chmod +x missing && \ - CFLAGS=-w ./configure --prefix=/usr --disable-nls --target=tricore && \ - make && make install && \ - rm -rf /usr/src/binutils + CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \ + make && make install -# This image isn't designed for building QEMU but building tests -ENV QEMU_CONFIGURE_OPTS --disable-system --disable-user +FROM debian:buster-slim +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +# Install very minimal QEMU build deps for use in CI +# $ lcitool variables debian-10 qemu+minimal +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \ + bzip2 \ + ca-certificates \ + ccache \ + g++ \ + gcc \ + git \ + libcapstone-dev \ + libfdt-dev \ + libglib2.0-dev \ + libpixman-1-dev \ + libtest-harness-perl \ + locales \ + make \ + ninja-build \ + perl-base \ + pkgconf \ + python3-pip \ + python3-setuptools \ + python3-wheel +COPY --from=0 /usr/local /usr/local +ENV PATH $PATH:/usr/local/bin/ + +# This image can only build a very minimal QEMU as well as the tests +ENV DEF_TARGET_LIST tricore-softmmu +ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools