From patchwork Sun Oct 29 14:50:19 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: 739051 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp742851wrt; Sun, 29 Oct 2023 07:52:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7jE0V0oeh4wvIHrN99QbyG0rtP3zOYXnEjsmTBUlbZi/NdzZHCJWgKGQx7cUR5BBm4br3 X-Received: by 2002:a05:6214:d66:b0:66f:2260:4ac9 with SMTP id 6-20020a0562140d6600b0066f22604ac9mr8516454qvs.59.1698591163865; Sun, 29 Oct 2023 07:52:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698591163; cv=none; d=google.com; s=arc-20160816; b=DZdUpFbytMsYL8cCZs81RekEXkCJBYasDLR3HxFZKDTifhcuNqiq7m3K54QHdEkxXE LjjOHbbHiIbXfupFM6Bc2jtNyhb3UGs2PA7M7+7bPhRhJGq/ynczEVi+pm2G5hVauict CxZTUUYgY5MnMNhQFStwcuzyH80t+AVGksyRLZRIfGEbQnxMmxHLGx0Td3RV/w/QEdLm pZe1prX+4M2wGrg51jSIYC+f0CAbBtXUbsEbhu7Trg43gW8Mlf7yx675DlKOCpzro2VJ KZpSIUu8pdLvPYp/StxLbDEtj9D+7qdnu6lJEVZ2YNDLBUgPnVSvGX38LKU7eljw6UyY JooA== 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=dWp+sro9eTgVGswSfv5JLu3E+WypSNqa+fab5HriMzU=; fh=xfTKN0dOWXSBe88Qf19pDztkyZ/4+zDTR3+/QiZRr4s=; b=WG1IYVkI+SW909+VSKcy2q6evFpYgIeSF9HCYzKU3ADKQ+wlnveBaGUaIOe1yAidfU DuCMYPkkcq1QD2ZStCJEgElFEj/efYYQJT08ncPliV59qgnPkYGPccHuRpJ3NUnH0zai j2EYFlNillvEroBDtPm8afuxASoRk4TcWviLMVSLTLGHcDCsM6WENG7RDRSKW7zZw42o qPtEqH8nH4/QGve1m/cL1hn1wEOYYLF5voCQ7DH5cW+qRHeqQ4og6qIYifpijnLxUZ+4 6tAHRUTdJ264zcTUsVaZ0rvqnnLCXRlFbweweuYvudRsfGFHu0cHSW10Yry7o8I7i7JA 1dWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LH+VwLlD; 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 x13-20020a0ce24d000000b00647290d544bsi4004951qvl.296.2023.10.29.07.52.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2023 07:52:43 -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=LH+VwLlD; 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 1qx77l-0007Sc-GW; Sun, 29 Oct 2023 10:50:45 -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 1qx77k-0007RA-1W for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:44 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qx77f-00056R-E9 for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:43 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-408382da7f0so27032945e9.0 for ; Sun, 29 Oct 2023 07:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698591038; x=1699195838; 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=dWp+sro9eTgVGswSfv5JLu3E+WypSNqa+fab5HriMzU=; b=LH+VwLlDDpsxOXdjcHOug11WFbrZffHw4onCVZv76vZ/6g7l/N5krVE/i4EmP0B085 g+JLUe1Z18oa3vIhPJsP8fmZK6NcTsJ2Gih0JcUCT62av0eXcz+AfTXP2DcUTCFXKuyD eNScucZQOfV9gFCbOfvjjFDwbL9fcukW883ejsYo7LDSSBmSfT9voKw7aFpr9W9pRML5 fNJHzmVLjaXPVaaxrfWkG70HFC/p5ePUQYceEPsNrQb/5J8WIn/eMnl6P+mIud1aTOxA DP+0FkVC4lMSARZZXlNdncDxAE6gHDf4JrkidU853ZGYNbYxagGFafKJ6EVaBIk31Ht+ K2ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698591038; x=1699195838; 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=dWp+sro9eTgVGswSfv5JLu3E+WypSNqa+fab5HriMzU=; b=uBG4WK2Jj7gOAhzABRkCNCH6v+RXI0uxvuP9JNXwserK5wVP2YOYYOdqjfrp+zdk65 GKmnjWy4NNQwg0LmLqlhM8SLtWsSzWcR3uDAhIEPU6hzOqvGgYbHpDmTgBZjXBff4hSz EOMvo85PzzZjooJODOUL98BX2dv9OQaQlKuM9bXEuZQA+J3m56PrMrzrpnLHrUY7Lii4 fpeQI65WqCaEGsydAFk9OT//X4DhgLceBGjW4UPRNhR+bptZiY4Lmdivss3CBUF8p16+ KpY87Rq0i2mYtAzHVfTyD1wA+5tifaMQyKU9bPXEToaFqVYEGaTw9UgrsDaKCjuLY2hx Nhkg== X-Gm-Message-State: AOJu0Yy/wATvSIGWvFV13UlkfBnJ2ZmrLqjo9APMmEVRof/gs9OIM1aF TUDK3JbNVJ14TCYvR3t7B7uNMejyaMdZkUZ/aXE= X-Received: by 2002:a5d:5904:0:b0:32d:9a88:e36 with SMTP id v4-20020a5d5904000000b0032d9a880e36mr5266481wrd.2.1698591038001; Sun, 29 Oct 2023 07:50:38 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s10-20020a5d69ca000000b00323287186aasm6075663wrw.32.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 850215F7A5; Sun, 29 Oct 2023 14:50:34 +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 05/19] gitlab: add build-loongarch to matrix Date: Sun, 29 Oct 2023 14:50:19 +0000 Message-Id: <20231029145033.592566-6-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::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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 We have the compiler and with a few updates a container that can build QEMU so we should at least run the check-tcg smoke tests. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- .gitlab-ci.d/buildtest.yml | 9 ++++++++ .gitlab-ci.d/container-cross.yml | 6 +++++ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-loongarch-cross.docker | 22 ++++++++++++++++++- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 5e9cbf9385..9500ea6e2c 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -303,6 +303,15 @@ build-some-softmmu: TARGETS: arm-softmmu aarch64-softmmu i386-softmmu riscv64-softmmu s390x-softmmu x86_64-softmmu MAKE_CHECK_ARGS: check-tcg + +build-loongarch64: + extends: .native_build_job_template + needs: + job: loongarch-debian-cross-container + variables: + IMAGE: debian-loongarch-cross + CONFIGURE_ARGS: --disable-tools --enable-debug + TARGETS: loongarch64-linux-user loongarch64-softmmu MAKE_CHECK_ARGS: check-tcg # We build tricore in a very minimal tricore only container diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 80c540230a..d200f3e00d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -52,6 +52,12 @@ hppa-debian-cross-container: variables: NAME: debian-hppa-cross +loongarch-debian-cross-container: + extends: .container_job_template + stage: containers + variables: + NAME: debian-loongarch-cross + m68k-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ab68b2dbad..5635d1537f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -125,7 +125,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ DOCKER_PARTIAL_IMAGES += debian-alpha-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross 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 DOCKER_PARTIAL_IMAGES += debian-mips-cross diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index b4bf265717..b25e779a2c 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -9,22 +9,42 @@ FROM docker.io/library/debian:11-slim # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + apt build-dep -yy qemu + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ build-essential \ + bison \ ca-certificates \ + ccache \ + clang \ + flex \ curl \ gettext \ git \ - python3-minimal + ninja-build \ + python3-pip \ + python3-setuptools \ + python3-venv \ + python3-wheel + +RUN /usr/bin/pip3 install tomli RUN curl -#SL https://github.com/loongson/build-tools/releases/download/2023.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \ | tar -xJC /opt ENV PATH $PATH:/opt/cross-tools/bin ENV LD_LIBRARY_PATH /opt/cross-tools/lib:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH + +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools +ENV DEF_TARGET_LIST loongarch64-linux-user,loongarch-softmmu + # As a final step configure the user (if env is defined) ARG USER ARG UID