From patchwork Tue Jul 20 23:27:01 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: 481620 Delivered-To: patch@linaro.org Received: by 2002:a17:907:d92:0:0:0:0 with SMTP id go18csp6017610ejc; Tue, 20 Jul 2021 16:49:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZhtph4/aBLJfxfmOFWbcOxE6o2PS9aXXczUQY0M2rNbm3QLs22mHqTtJTMz2YpUBO3Z3L X-Received: by 2002:a05:620a:e04:: with SMTP id y4mr32171276qkm.196.1626824994402; Tue, 20 Jul 2021 16:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626824994; cv=none; d=google.com; s=arc-20160816; b=vfsB+dGBvejrToK+7tqDdDKhbT8ZzRTcET9MQTdFcah/LifsjUtHPSNsLG4QEPQPhk Nq8L4H0IoFQBSA36ta59DzDfb3O0aaaFjXQZh0c/PzuB2VobxaV9dqlNRtuy0C0S4log oABxC0tiVJt/uaEskAB6Ef3Q/4d38nZGSs0chuC0717FtkloQ1Ai5qmVTg2ZDkVkqPhE hZDcKhpYZ7s9NfoU7eYqHlYpyXkz7P54fj8DTBvPku8neoYgBYslV0dtvLlOkXNAJfDi m8jsBSfNLdc/fi2CID3G4219fiDvvw/BgsmmQaediER3bF4ZouNDMsEFR4lsYi/SYWjA EQMg== 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=+kMBGMCNJi8vwExvrsxeqq8I2lJQnUdceeasIbv5WjI=; b=Rn39W7uKbSd05VpdB64zhU+FIJmIHcKxZFSLtxjc2AEB6g2pHb9Iva6b5h7rf9dxzU 4y3ST4a4tf1HU1Wu3TleiEEBtCgLD4cwhTAOUlHAQ9wuHk3kDsvbKsaW9XavKbfp2rmU r6gC1o2S+MwIok6RbCf7OYVbu2lCa93KYsPMhQp11tJxTyDrRHVpqo3bBiLkltc66CEd Fp00ofYO8jjN6WodFv1L39hIAparjELNbQkqiZC7eGJci9kxK6WDa0Pkaf4F+w/Vwp4T kURkIUPDStSoEi1MlFb3Wnd5nyKiPALhYzQZp1kH1y65Ts622CtQmY5jvI1mtJ70y20G qKqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YlTVyyB+; 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 r128si17754958qkb.115.2021.07.20.16.49.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Jul 2021 16:49:54 -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=YlTVyyB+; 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]:33682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5zUn-0006N1-Ls for patch@linaro.org; Tue, 20 Jul 2021 19:49:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5zFu-00043h-6M for qemu-devel@nongnu.org; Tue, 20 Jul 2021 19:34:30 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:45869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5zFr-0001fd-Fl for qemu-devel@nongnu.org; Tue, 20 Jul 2021 19:34:29 -0400 Received: by mail-wr1-x42c.google.com with SMTP id t5so155887wrw.12 for ; Tue, 20 Jul 2021 16:34:27 -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=+kMBGMCNJi8vwExvrsxeqq8I2lJQnUdceeasIbv5WjI=; b=YlTVyyB+T3S/TTstUbFp4zg0H8cEcjANUAj1YvJyx4EDYjgBdFT3/01V1b1N0EjBFn 2Dy6KiLqlwN1kpBX2h2Ned6ILFOSa63z54UzdmOQnddm1U8rBVRazdhrd7lUkszEz13i h+39yfI9aTBeRTShy5/eq3e1zDQpkDb7uhtwpACQsJDiqh49/I/easHzMGVmwfkVIhI4 pwhDuELoUA9uA7l6sx1nDCMKvJp6vfrNQmhRsg9/PsQX/uI3tVPwpr/SvXyK7mhxG6fL BAyxP3ppVOx1Ly8uNNrimzwFhVppV6pWiLhbbC44rc1gt9ZhLkfcsp87lddFMgf6MlIP p4MA== 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=+kMBGMCNJi8vwExvrsxeqq8I2lJQnUdceeasIbv5WjI=; b=cXtVbDTaVbetBB5DSjPqXuyWaLaao2AwdMgfviR3ICfuX4zfBNMjwuSmH2I1kGoWZ1 /wEsUaH/Q3f2JYd2/JH5+3HrNH/Y9cYg8cFP0VZ4F8axSkijTGOM9pMtvQzL38dTG97d FKtluY4nme0fFvy8ADnedSHTmsCF/8mFIUqXftff/9GRfwVY3QZLpHyS9stbx2PV97FU N7nkEnqzkI6oK02e1orD7uBqFT6tLQbfdl8hPx3KisEdQffpm769/SzXMtYYVVix9q3e 5RNjakQB7Gh+HuB3p2tsRLK1Vc57z79RC8Zbsde91RuTcuCGOafzGVFuNhpnlZj7A2mj ZpmQ== X-Gm-Message-State: AOAM531EGmkayjDozt5GcpqyrYp8iPUwDxbmUcCt6MsFSR5OAGUDTT+V 0/mST5iHlqx2tO/tPhOuzRTQtw== X-Received: by 2002:adf:fc85:: with SMTP id g5mr39448047wrr.296.1626824065998; Tue, 20 Jul 2021 16:34:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s6sm29684144wrt.45.2021.07.20.16.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 16:34:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 606611FFB1; Wed, 21 Jul 2021 00:27:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 27/29] gitlab: enable a very minimal build with the tricore container Date: Wed, 21 Jul 2021 00:27:01 +0100 Message-Id: <20210720232703.10650-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210720232703.10650-1-alex.bennee@linaro.org> References: <20210720232703.10650-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rather than base of the shared Debian 10 container which would require us to bring in even more dependencies just bring in what is needed for building tricore-softmmu in GitLab. We don't even remove the container from the DOCKER_PARTIAL_IMAGES lest we cause more confusion. Signed-off-by: Alex Bennée Message-Id: <20210720114057.32053-4-alex.bennee@linaro.org> --- .gitlab-ci.d/buildtest.yml | 11 ++++++ .../dockerfiles/debian-tricore-cross.docker | 34 ++++++++++++++++--- 2 files changed, 40 insertions(+), 5 deletions(-) -- 2.32.0.264.g75ae10bc75 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 89df51517c..48cb45a783 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 --disable-fdt --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..d8df2c6117 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -1,23 +1,47 @@ # # Docker TriCore cross-compiler target # -# This docker target builds on the debian Stretch base image. +# This docker target builds on the Debian Buster base image but +# doesn't inherit from the common one to avoid bringing in unneeded +# dependencies. # # Copyright (c) 2018 Philippe Mathieu-Daudé # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM qemu/debian10 +FROM docker.io/library/debian:buster-slim MAINTAINER Philippe Mathieu-Daudé +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \ + bzip2 \ + ca-certificates \ + ccache \ + g++ \ + gcc \ + git \ + libglib2.0-dev \ + libpixman-1-dev \ + libtest-harness-perl \ + locales \ + make \ + ninja-build \ + perl-base \ + pkgconf \ + python3-pip \ + python3-setuptools \ + python3-wheel + 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 && \ + CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \ make && make install && \ rm -rf /usr/src/binutils -# This image isn't designed for building QEMU but building tests -ENV QEMU_CONFIGURE_OPTS --disable-system --disable-user +# 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 --disable-fdt