From patchwork Sun Dec 8 17:07:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019778 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=ZQ0Wk0z1; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vf50M9cz1yRf for ; Mon, 9 Dec 2024 06:08:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AB0098953F; Sun, 8 Dec 2024 20:07:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="ZQ0Wk0z1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2B4B089538; Sun, 8 Dec 2024 20:07:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EF59D893F9 for ; Sun, 8 Dec 2024 20:07:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82b.google.com with SMTP id d75a77b69052e-4674c597ee5so11776411cf.0 for ; Sun, 08 Dec 2024 11:07:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684871; x=1734289671; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BhOBV6xNV5M88OaGT4z9V3mdUBnBbaDhiN097MXjuw4=; b=ZQ0Wk0z1NBiBPUOO8dTu/IxT+JFsK3yZXs4qPx8b8va4EuKJyVITVDtrh3rN8cmYdY eTP8r9orgvTo0tmvh+z3alZWpPJXZL+BzsbnzlpjXR7NQtSgi1SzQaZUGVvv3Ppb3Br7 b1S0pOJC7pzwjJ4kddCl08QqKquc1ZU1nTSTk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684871; x=1734289671; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BhOBV6xNV5M88OaGT4z9V3mdUBnBbaDhiN097MXjuw4=; b=bvrSy14kJP+iCF9vghCn3LAMpx4/a6pwA9Veplja+EZ5YT+BFfCg08jD2VOrdJej+K TrarkVkt8YeOJQWJWHK3eNg806GjFb6sdvRTlJmzHSxlSgsWXY5yTALEfypOFfFu/1Ov gQMvbrEi0IPiBSqMKSaQffzX0xz7IGGenKXjCfHxJtbF0Z9/2IAEwDfvFJssPtO7Kypy 4nWd6UvvVh+1QXpr3a4uCW8qRvg/b86sW3OlxnahC+fHeHAs5ijQLrhpUzX0uOj+VNX1 b8XbLfzxIZhnWo2Q4F13Gly/IXOiCueu9BBWdtuIfJRDPkVa0K2rS5wE2pzVfYDlWzrP GNjw== X-Gm-Message-State: AOJu0YwSabRJamf6TraNixPkOtyTv1wwYeK2t+E7tpoajoGTUTwLA0AD 1RFWhhPxn2gmhjXKyTz/iFkVskYA23Zgi1k8+e00osQI43IPH/TrcPfRxBYbmo2FEDhlBfpEz77 +uzk= X-Gm-Gg: ASbGncvXQNtkrPdCiBps//4Ieqkdc7Pth9lCIj3VbWjsrlASSEamyzv1HYPmTeY8WY3 C1LImvXMn3Ifv2HRYAY7PK0XgSpFzznGa3rTrg5cnINpkJYf2Ji00mSBbeUGDrgbiMOb6oxES+k Xh/sFgCgWTYeOfRNvZcxLAbVAWsbdbt7u1qj9/u2ErCtLfHsf199n1wKTHGXb8ZU4OK6e8swDE4 /LqWbHOQoeexLlSWsEQsHeZL0I4nGh83ruGhAIzL/wIAFFjNKmjAcOlrC41owbGvSYeUgjCSw== X-Google-Smtp-Source: AGHT+IGNMKY5/CA2Q/OKSSeqUTnCiMMFkDov2dQUjS2n2vpZvDxLJYAnmqu/4PRfcY1cn5W5oMEhMQ== X-Received: by 2002:ad4:576f:0:b0:6d8:85f2:c3 with SMTP id 6a1803df08f44-6d8e70ce90amr140304976d6.14.1733684870881; Sun, 08 Dec 2024 11:07:50 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.07.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:07:50 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 1/9] Docker/CI: Only test Xtensa on amd64 hosts Date: Sun, 8 Dec 2024 11:07:24 -0600 Message-ID: <20241208190741.4192601-2-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The xtensa architecture is interesting in that the platforms we support are only valid on the binary-only toolchains as the DC233C instruction set requires those toolchains (and not the FSF instruction set). Only install the binary toolchain on amd64 hosts and only run the tests on them as well. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- .gitlab-ci.yml | 8 +++++++- tools/docker/Dockerfile | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57037e243ecb..2671c3bb1061 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,12 +144,14 @@ build all PowerPC platforms: exit $ret; fi; +# We exclude xtensa here due to not being able to build on aarch64 +# hosts but covering all platforms in the pytest section. build all other platforms: extends: .world_build script: - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; - ./tools/buildman/buildman -o /tmp -PEWM -x arm,powerpc || ret=$?; + ./tools/buildman/buildman -o /tmp -PEWM -x arm,powerpc,xtensa || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP; exit $ret; @@ -451,6 +453,8 @@ qemu-xtensa-dc233c test.py: variables: TEST_PY_BD: "qemu-xtensa-dc233c" TEST_PY_TEST_SPEC: "not sleep and not efi" + tags: + - all <<: *buildman_and_testpy_dfn r2dplus_i82557c test.py: @@ -514,6 +518,8 @@ xtfpga test.py: TEST_PY_BD: "xtfpga" TEST_PY_TEST_SPEC: "not sleep" TEST_PY_ID: "--id qemu" + tags: + - all <<: *buildman_and_testpy_dfn coreboot test.py: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index ce1ad7cb23a2..8723834e6e5c 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -320,7 +320,9 @@ RUN virtualenv -p /usr/bin/python3 /tmp/venv && \ # Create the buildman config file RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman RUN /bin/echo -e "kernelorg = /opt/gcc-13.2.0-nolibc/*" >> ~/.buildman -RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; \ + fi RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman RUN /bin/echo -e "\nx86 = i386" >> ~/.buildman; From patchwork Sun Dec 8 17:07:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019779 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=jbVqb/QS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vf94GkKz1yRf for ; Mon, 9 Dec 2024 06:08:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0AABE8946D; Sun, 8 Dec 2024 20:07:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="jbVqb/QS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4995589541; Sun, 8 Dec 2024 20:07:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7CC07894C6 for ; Sun, 8 Dec 2024 20:07:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-6d8d44e177cso36113216d6.1 for ; Sun, 08 Dec 2024 11:07:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684872; x=1734289672; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JTosqUnFCY+pSDBdm3SL/jn4jbL4Isft+guQxMhJwfw=; b=jbVqb/QS8iPAnG/Fh3jvergPGOLCXHmL8bvYho3uJtzuYf2asaeY69kGCtUJ7lVcrR ewXZexJ7CU2HV9BAZ8YRUBh+fdb3xEm7/w0ANY49ovwZSkCJYtYxYpUrBseDKe/Gx9Fz fMFdE1VaL9gRXD2PLq8BIMOAFduJ6Jgw9/j/8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684872; x=1734289672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JTosqUnFCY+pSDBdm3SL/jn4jbL4Isft+guQxMhJwfw=; b=Dmw/unxKe3gUirrXpuPcjWwV5ZHRFGchTXm8MtEom3fk85uoA/BsReUkch4L9MN6HI pAnlNsdYNPzurVIaG+w9wxmnvVmHQR0o5uvoyilR4M2cyBe9iBmJA9Pec6sbD71S2DXy Sr4OIgQUDkU9mDIaZtC9LilzVV81lQ281RJ5KZ1zW6+9oUUPCLALLmyOkkgnBoiBH5+q Awy6WjSucQQkf9D2vr14awgBYzo4V6tKE69LRykYN1gIRSsJ8TmHiuivuZ+/SbNSQwXM ZyU/r94hUjhr9j6Za2qo73R/55F+MWsNI+gYn4VISC/1qdekNgnv5IsmuGALFbr706R4 xF8A== X-Gm-Message-State: AOJu0Yx069NEm7j0mOoUl9Yhhnbf1H000iKGojEc+Ss+zM3Xnq/haMDi YO027YsLcdECMi7uLmRe/u6t7nx/dtf0m+f5QjCBkXOspyZvpko0A8KsjB73fy5kOwnKw8Cd99F TV8E= X-Gm-Gg: ASbGncssYQgYnO63NzELBtECCsul0ntqAphwMcVIoh6GqmXtyStBgYIyiUeS/tf9s8I ojs+4PPkiY6Scolp82cA1KlbL2hbDCr+NSifT0LCXb8Ubjs+lSjpPGtJkk5Yjk/Knztlpu4i7e6 G5nV1rBaG+lmK5dnmtx50ed6vR4aZM2mZ3R2wriGQURC1TOSsbZfKDYMOmK4k8KpC2JvUdxKHtu 9fHhCKiI7xE6G+13BLMejwcctVRmIyXVJixOkWkXgl1CjFims/fcNzRpKt4395PQXse7KvDuQ== X-Google-Smtp-Source: AGHT+IGSohW8qa6aMx9lOcZFRstKEJHPi07lvb/wknNh+BHwYbmx0tenZRVVdXtPH8qGvu+jg4P75A== X-Received: by 2002:a05:6214:55c4:b0:6d8:f50e:8036 with SMTP id 6a1803df08f44-6d8f50e8397mr153300386d6.20.1733684872344; Sun, 08 Dec 2024 11:07:52 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.07.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:07:51 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 2/9] docker: Use ${TCVER} more widely Date: Sun, 8 Dec 2024 11:07:25 -0600 Message-ID: <20241208190741.4192601-3-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Remove the rest of the places where we hard-code the version of the toolchain we're using. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- tools/docker/Dockerfile | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 8723834e6e5c..38a9c4b9ec69 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -156,11 +156,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ mkdir -p /opt/grub && \ ./configure --target=aarch64 --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-13.2.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-13.2.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \ - TARGET_STRIP=/opt/gcc-13.2.0-nolibc/aarch64-linux/bin/aarch64-linux-strip \ - TARGET_NM=/opt/gcc-13.2.0-nolibc/aarch64-linux/bin/aarch64-linux-nm \ - TARGET_RANLIB=/opt/gcc-13.2.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \ + TARGET_CC=/opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \ + TARGET_STRIP=/opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux-strip \ + TARGET_NM=/opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux-nm \ + TARGET_RANLIB=/opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \ make -j$(nproc) && \ ./grub-mkimage -O arm64-efi -o /opt/grub/grubaa64.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ @@ -170,11 +170,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ make clean && \ ./configure --target=arm --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \ - TARGET_OBJCOPY=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy \ - TARGET_STRIP=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip \ - TARGET_NM=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \ - TARGET_RANLIB=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib && \ + TARGET_CC=/opt/gcc-${TCVER}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \ + TARGET_OBJCOPY=/opt/gcc-${TCVER}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy \ + TARGET_STRIP=/opt/gcc-${TCVER}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip \ + TARGET_NM=/opt/gcc-${TCVER}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \ + TARGET_RANLIB=/opt/gcc-${TCVER}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib && \ make -j$(nproc) && \ ./grub-mkimage -O arm-efi -o /opt/grub/grubarm.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ @@ -184,11 +184,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ make clean && \ ./configure --target=riscv64 --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-13.2.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-13.2.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \ - TARGET_STRIP=/opt/gcc-13.2.0-nolibc/riscv64-linux/bin/riscv64-linux-strip \ - TARGET_NM=/opt/gcc-13.2.0-nolibc/riscv64-linux/bin/riscv64-linux-nm \ - TARGET_RANLIB=/opt/gcc-13.2.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \ + TARGET_CC=/opt/gcc-${TCVER}-nolibc/riscv64-linux/bin/riscv64-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-${TCVER}-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \ + TARGET_STRIP=/opt/gcc-${TCVER}-nolibc/riscv64-linux/bin/riscv64-linux-strip \ + TARGET_NM=/opt/gcc-${TCVER}-nolibc/riscv64-linux/bin/riscv64-linux-nm \ + TARGET_RANLIB=/opt/gcc-${TCVER}-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \ make -j$(nproc) && \ ./grub-mkimage -O riscv64-efi -o /opt/grub/grubriscv64.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ @@ -198,22 +198,22 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ make clean && \ ./configure --target=i386 --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-13.2.0-nolibc/i386-linux/bin/i386-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-13.2.0-nolibc/i386-linux/bin/i386-linux-objcopy \ - TARGET_STRIP=/opt/gcc-13.2.0-nolibc/i386-linux/bin/i386-linux-strip \ - TARGET_NM=/opt/gcc-13.2.0-nolibc/i386-linux/bin/i386-linux-nm \ - TARGET_RANLIB=/opt/gcc-13.2.0-nolibc/i386-linux/bin/i386-linux-ranlib && \ + TARGET_CC=/opt/gcc-${TCVER}-nolibc/i386-linux/bin/i386-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-${TCVER}-nolibc/i386-linux/bin/i386-linux-objcopy \ + TARGET_STRIP=/opt/gcc-${TCVER}-nolibc/i386-linux/bin/i386-linux-strip \ + TARGET_NM=/opt/gcc-${TCVER}-nolibc/i386-linux/bin/i386-linux-nm \ + TARGET_RANLIB=/opt/gcc-${TCVER}-nolibc/i386-linux/bin/i386-linux-ranlib && \ make -j$(nproc) && \ ./grub-mkimage -O i386-efi -o /opt/grub/grub_x86.efi --prefix= -d \ grub-core normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd && \ make clean && \ ./configure --target=x86_64 --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-13.2.0-nolibc/x86_64-linux/bin/x86_64-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-13.2.0-nolibc/x86_64-linux/bin/x86_64-linux-objcopy \ - TARGET_STRIP=/opt/gcc-13.2.0-nolibc/x86_64-linux/bin/x86_64-linux-strip \ - TARGET_NM=/opt/gcc-13.2.0-nolibc/x86_64-linux/bin/x86_64-linux-nm \ - TARGET_RANLIB=/opt/gcc-13.2.0-nolibc/x86_64-linux/bin/x86_64-linux-ranlib && \ + TARGET_CC=/opt/gcc-${TCVER}-nolibc/x86_64-linux/bin/x86_64-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-${TCVER}-nolibc/x86_64-linux/bin/x86_64-linux-objcopy \ + TARGET_STRIP=/opt/gcc-${TCVER}-nolibc/x86_64-linux/bin/x86_64-linux-strip \ + TARGET_NM=/opt/gcc-${TCVER}-nolibc/x86_64-linux/bin/x86_64-linux-nm \ + TARGET_RANLIB=/opt/gcc-${TCVER}-nolibc/x86_64-linux/bin/x86_64-linux-ranlib && \ make -j$(nproc) && \ ./grub-mkimage -O x86_64-efi -o /opt/grub/grub_x64.efi --prefix= -d \ grub-core normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd && \ @@ -319,7 +319,7 @@ RUN virtualenv -p /usr/bin/python3 /tmp/venv && \ # Create the buildman config file RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman -RUN /bin/echo -e "kernelorg = /opt/gcc-13.2.0-nolibc/*" >> ~/.buildman +RUN /bin/echo -e "kernelorg = /opt/gcc-${TCVER}-nolibc/*" >> ~/.buildman RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; \ fi From patchwork Sun Dec 8 17:07:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019780 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=NTEmhHyr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vfL4zQXz1yRf for ; Mon, 9 Dec 2024 06:08:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6BDDE895A1; Sun, 8 Dec 2024 20:07:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="NTEmhHyr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87ACF893D6; Sun, 8 Dec 2024 20:07:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2ADF3893F9 for ; Sun, 8 Dec 2024 20:07:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-7b6c3629816so71300985a.1 for ; Sun, 08 Dec 2024 11:07:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684874; x=1734289674; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dRURVZeHrlrrvUADeWkc5efAgR4545thxV0StQv2ER0=; b=NTEmhHyrQdfwKhJMC9AU2K6RP7tDPpuWNHwghv2hEsahEALESOfojL91ROGe/qaukp hzEx/YeWZGgPxXTcLPDvY0Nef5Sbio2p9BJ7I8hCIoO8BmrIgP/EY1ecfiyaIigVXvYc zLkIcd/+ngfXjQaxiKwi2C2sS8jq33Rj116Ag= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684874; x=1734289674; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dRURVZeHrlrrvUADeWkc5efAgR4545thxV0StQv2ER0=; b=uPuRClc+TEWkQci9vVEcup/UmFC8ep8FN2zqHcnckFXjt6PGim3alXczfmDeflATYz kCL5Mu+Kavlq+ZlnrQLvhxT94JScBrJ+38OoApHzL02lMEDd/J2DJWZ32raoEDi2Oifs qb1m3LQQ2y5cYxzQnuciD69GLbWlK7JaS/Kc43+D/cTdzvYwA4EpF/y9Bgv+c9o1m6ZA YDT8n8bHi+lNLENrW4brtqp2+5oQt3sbZgQRNHIkAIuroPrqOxCykM6sA/Z4UJ3uzxhm voRxj23q31glKSv7JXpDT5wUSZVjFx1ltGedtLoZTdZ74RHMPzry9VBjBylvOtnMbV1i Pm3A== X-Gm-Message-State: AOJu0YzypPRTArsb47SFsQugKBtfxFl4kVhcVkvvzfT7ITe38/AdDW2n cYNnY9ALz3dBWoqmHbT/xou+qBti/yqheJm7vf/jLxmVe6B7YtYIGem9d3PYwTDgMbAMQsqbQhR KoHM= X-Gm-Gg: ASbGncvEz7HjiKBuGUvKqL1/p4Voyw+y5tNvkzvaqfgOCUV4LzB/YmcjWn4iGxyDF/J f/ns50dQPSogDWMrXm3JEVDMDsqaN/UsYJUA8N4I/gaipBCfl1dTngTIRQdNCG3hsI6GlgsmpvN 1iwllYIsntkOp9opTLcotiU+M7B8nuZn6trabhp6pVqjyirxyae1FatRmY0b/uD+yLHm6g6hkrK NJ+vQtouq5kwl3t+JbLkxKqAaWjGDb9gjTJoBMUTpwc8h6NSUgCwVEg/pZldxBDvBTDrxMCLg== X-Google-Smtp-Source: AGHT+IFKw+XP/YSD07EUdp43uAUjmP1+ZryCDzQp0KGIMyC0Ccgfa1Yhs44einXfZV7xJGerxJUzqg== X-Received: by 2002:a05:6214:c82:b0:6d8:8f81:e2ea with SMTP id 6a1803df08f44-6d8e71a6756mr148968936d6.31.1733684874083; Sun, 08 Dec 2024 11:07:54 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.07.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:07:53 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 3/9] GitLab CI: Make wider use of tags Date: Sun, 8 Dec 2024 11:07:26 -0600 Message-ID: <20241208190741.4192601-4-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean First, introduce DEFAULT_ALL_TAG, DEFAULT_ARM64_TAG, DEFAULT_AMD64_TAG and DEFAULT_FAST_AMD64_TAG and remove the previous DEFAULT_TAG (as anyone making use of that will need to adjust their jobs). This allows us to say that some jobs can run on amd64 or arm64 hosts under the all tag, while some jobs must run on amd64 (the Xtensa jobs due to binary-only toolchains and sandbox for now) Then we rework the world build stage to only run on our very fast amd64 hosts, or our arm64 hosts (which are also very fast). This should result in a similar overall build time but also a much more consistent overall build time as we won't have the two big world jobs possibly run on our slower build nodes. Signed-off-by: Tom Rini --- .gitlab-ci.yml | 74 ++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2671c3bb1061..7912eeee4401 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,17 @@ # SPDX-License-Identifier: GPL-2.0+ variables: - DEFAULT_TAG: "" + DEFAULT_ALL_TAG: "all" + DEFAULT_ARM64_TAG: "arm64" + DEFAULT_AMD64_TAG: "amd64" + DEFAULT_FAST_AMD64_TAG: "fast amd64" MIRROR_DOCKER: docker.io SJG_LAB: "" PLATFORM: linux/amd64,linux/arm64 default: tags: - - ${DEFAULT_TAG} + - ${DEFAULT_ALL_TAG} # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile @@ -102,56 +105,21 @@ stages: junit: results.xml expire_in: 1 week -.world_build: +build all platforms in a single job: stage: world build rules: - when: always - -build all 32bit ARM platforms: - extends: .world_build - script: - - ret=0; - git config --global --add safe.directory "${CI_PROJECT_DIR}"; - pip install -r tools/buildman/requirements.txt; - ./tools/buildman/buildman -o /tmp -PEWM arm -x aarch64 || ret=$?; - if [[ $ret -ne 0 ]]; then - ./tools/buildman/buildman -o /tmp -seP; - exit $ret; - fi; - -build all 64bit ARM platforms: - extends: .world_build + parallel: + matrix: + - HOST: "arm64" + - HOST: "fast amd64" + tags: + - ${HOST} script: - - virtualenv -p /usr/bin/python3 /tmp/venv - - . /tmp/venv/bin/activate - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; pip install -r tools/buildman/requirements.txt; - ./tools/buildman/buildman -o /tmp -PEWM aarch64 || ret=$?; - if [[ $ret -ne 0 ]]; then - ./tools/buildman/buildman -o /tmp -seP; - exit $ret; - fi; - -build all PowerPC platforms: - extends: .world_build - script: - - ret=0; - git config --global --add safe.directory "${CI_PROJECT_DIR}"; - ./tools/buildman/buildman -o /tmp -P -E -W powerpc || ret=$?; - if [[ $ret -ne 0 ]]; then - ./tools/buildman/buildman -o /tmp -seP; - exit $ret; - fi; - -# We exclude xtensa here due to not being able to build on aarch64 -# hosts but covering all platforms in the pytest section. -build all other platforms: - extends: .world_build - script: - - ret=0; - git config --global --add safe.directory "${CI_PROJECT_DIR}"; - ./tools/buildman/buildman -o /tmp -PEWM -x arm,powerpc,xtensa || ret=$?; + ./tools/buildman/buildman -o /tmp -PEWM -x xtensa || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP; exit $ret; @@ -200,6 +168,8 @@ Build tools-only and envtools: Run binman, buildman, dtoc, Kconfig and patman testsuites: extends: .testsuites + tags: + - ${DEFAULT_AMD64_TAG} script: - git config --global user.name "GitLab CI Runner"; git config --global user.email trini@konsulko.com; @@ -259,22 +229,30 @@ Check packing of Python tools: # Test sandbox with test.py sandbox test.py: + tags: + - ${DEFAULT_AMD64_TAG} variables: TEST_PY_BD: "sandbox" <<: *buildman_and_testpy_dfn sandbox with clang test.py: + tags: + - ${DEFAULT_AMD64_TAG} variables: TEST_PY_BD: "sandbox" OVERRIDE: "-O clang-17" <<: *buildman_and_testpy_dfn sandbox64 test.py: + tags: + - ${DEFAULT_AMD64_TAG} variables: TEST_PY_BD: "sandbox64" <<: *buildman_and_testpy_dfn sandbox64 with clang test.py: + tags: + - ${DEFAULT_AMD64_TAG} variables: TEST_PY_BD: "sandbox64" OVERRIDE: "-O clang-17" @@ -329,6 +307,8 @@ evb-ast2600 test.py: <<: *buildman_and_testpy_dfn sandbox_flattree test.py: + tags: + - ${DEFAULT_AMD64_TAG} variables: TEST_PY_BD: "sandbox_flattree" <<: *buildman_and_testpy_dfn @@ -454,7 +434,7 @@ qemu-xtensa-dc233c test.py: TEST_PY_BD: "qemu-xtensa-dc233c" TEST_PY_TEST_SPEC: "not sleep and not efi" tags: - - all + - ${DEFAULT_AMD64_TAG} <<: *buildman_and_testpy_dfn r2dplus_i82557c test.py: @@ -519,7 +499,7 @@ xtfpga test.py: TEST_PY_TEST_SPEC: "not sleep" TEST_PY_ID: "--id qemu" tags: - - all + - ${DEFAULT_AMD64_TAG} <<: *buildman_and_testpy_dfn coreboot test.py: From patchwork Sun Dec 8 17:07:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019781 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=U810cpN4; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vfd3vCvz1yRf for ; Mon, 9 Dec 2024 06:08:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D77B0895C8; Sun, 8 Dec 2024 20:08:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="U810cpN4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AACFF895A4; Sun, 8 Dec 2024 20:07:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 861AE894C6 for ; Sun, 8 Dec 2024 20:07:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-6d8f916b40bso19348036d6.3 for ; Sun, 08 Dec 2024 11:07:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684875; x=1734289675; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ij3EjV9iBC8Ud9fSv5JKryfIr4RiPnI7BAhm7MBdREY=; b=U810cpN4+yDsG7u8SOJda2xQKaUgSCaRjDhD1jDIqXVzHu++yaXBZGCImuRAD++MMy yIgGkEpUAhAJ6Q8fDcy2D4G3s9F3jdxdogfv4/FFrkglGfdbEoRc4FRBD+yVEHXxzXgT HvSmi54tFAQb3/hb5C4cWuay32Copslxx6hhM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684875; x=1734289675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ij3EjV9iBC8Ud9fSv5JKryfIr4RiPnI7BAhm7MBdREY=; b=EKgXrL8ngKK9heosVl6cIRNkMlFRuvwIUHywmI12ZZn2OtJFTH8aP47Xffd6qCCoN9 r/VySHjb6o0LKWwHeB92bXAME4Qt0rmiBWECTUPiWxkMhXBGGVRVbmJ1dyz+ofo/yDna oJ++YaLF+84Fq7uYKA+a19IqkLy82szwTZhxBPthx/R5QtJI8/PvSGTCvARkMtrXKDjk 0T8svsrg5ZK75zbPG56FLwsFnJ1S55Udj5CCceJZMSMhZnU1wT/z+AZmiiVqKkHPgAcS ufL9slv+xDIVEx8uSb8jCgKUsXAWJ15buwPbiPVVTUn/Ab7AkiLcRIw2aVE6c0L7Cz8r fLbA== X-Gm-Message-State: AOJu0YwutueyufJiAPqKUqFyQayrggm2VJgKO+LocnXCWhW07WqECTk+ 98jBN8wq17M9isL9RwCgRXRE6WlD8msQLosRS+f0gsOqViWRugOngQg0TJQn+v5SJ4BzmRnEo5S 1Slk= X-Gm-Gg: ASbGnct/p8WGs/1wUXMq6OiNFBkk+E6h0sIP0XqyJECqCCud+dFGhsBrMpX8rH+W6qN 0UsKKa/Caz9SAQq/jXWMP+yusce9nQOstWSL2t154wUaTbfbujsH/Nf6LPVluLYEGgz76chrtjl xviW0V8GdoYsb/SwLcqFiRlGFhj+ezb8Z4HFju+AZj8Zh5Vae/8RkK2VtTPbW35Uvx6v9jxVfQ1 o+BO2964XltzGPIJJcpGoNfxKAzJzlpRxuJFD9XF26h/a/M9/yAckBCdLOouzPVL0VxSc45bQ== X-Google-Smtp-Source: AGHT+IF1+w714Oc0qYDGwlSD3osCn9vKOtUvCgCyDFDOVcD/eWQ1WqRRh+PAcHpmQvs2ONLIwZl40A== X-Received: by 2002:a05:6214:ca1:b0:6d4:1ea3:981d with SMTP id 6a1803df08f44-6d8e71bb192mr175488646d6.43.1733684875488; Sun, 08 Dec 2024 11:07:55 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.07.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:07:55 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 4/9] GitLab: Add a default workflow stanza Date: Sun, 8 Dec 2024 11:07:27 -0600 Message-ID: <20241208190741.4192601-5-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean When validating our current pipeline, a warning is produced about a lack of a default workflow. For how we use it, we can add a simple default of "always". Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7912eeee4401..ae9120655b0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,10 @@ default: tags: - ${DEFAULT_ALL_TAG} +workflow: + rules: + - when: always + # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240808-03Dec2024 From patchwork Sun Dec 8 17:07:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019783 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=IMraxU+Y; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vg15lDHz1yRf for ; Mon, 9 Dec 2024 06:09:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A22CD8954F; Sun, 8 Dec 2024 20:08:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="IMraxU+Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5B9B8954B; Sun, 8 Dec 2024 20:08:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EF808893D6 for ; Sun, 8 Dec 2024 20:07:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-6d900c27af7so11267636d6.2 for ; Sun, 08 Dec 2024 11:07:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684877; x=1734289677; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=bDxMXaH4Y8EfWN3T0ePQlVwNiD+2Wt4L6wbiZh7Go4I=; b=IMraxU+YqbteVGSkVbCOW6knSJTF6+CSm4OnLg+/1+K0CX8rBb0UME9c5e4BZQL7ow P8I1e6jCxa0TL4E9pBnf2iLKJJkWR0LTnf1Rg6M6D+PccvGHobCbE0rZb/CEtz6Hw35+ mbkldxJNKe1zpMCCvDYGdVJCoL2PQ+dEGZbGo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684877; x=1734289677; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bDxMXaH4Y8EfWN3T0ePQlVwNiD+2Wt4L6wbiZh7Go4I=; b=Dz0pGrfJa3oeD1VeW3cS3a3qdZ5qxdYMHdEOBs0MkfLOyGJOuRfXaAdtxICOgjNcND XEPqL5Bs+2Cd1M3s8Wu7w0SMepxWvQDBlLiGivCwG9ujZqJ4Ga8k0MY1W39WcS0w5q9C LyiIaKM8JZdORNeY+UTxmxF/RpeuOjCY0XqGiB8qXA5y2eCdLZ0z7qo6XNwTcgl+AgWg A6bIaJGc9h1igS8fMtbi8vpDoXQG1Rf43TjY0FITIHebVutITRkvdcbizihqeO9B2x29 PBFYk5e+dVYTPDECVxLs4LUiPuzXm2jAaekmcBXUZsfLn/loYuw/R9c2YilNbvqpdUKi TXSg== X-Gm-Message-State: AOJu0YwXpDM8sw6OeeE2OPnLo6sxw/szzwIFjUX3iyOaB1eSpXQUH22Q RBC0BWQzp5EbWWJm5DfWsppio/h+74CJWGfm0U+LJwsUbWuWDF+IsTciI1otKPS2vLbmCpfCu4d H4Yg= X-Gm-Gg: ASbGncuWy8QcSax5d4YLalLCfS6ZYbhmToXJ6IlJpFnUaM3TcEgBcp3HvP107rYFWme Gj1D2A7Su7hQ+IuRFu9V6crVI/4reBkh+xmUR8ljwkZiOsg8cxAcA6+NPg3cwsU0K61C41K3gAs vnuiDtKnCJi2wThiSxBYuYW4m5f65lW2DHw03i69ITWrVDcJa0dPN5Ft0xmulccAXtrCpsKSWP7 a4K+UAkqskVPUz7qMXxiAQchp5Hg9yvvxhY6SMdfdqnN4YivuanKmQ/uws4F4oQpH0/f9AeOQ== X-Google-Smtp-Source: AGHT+IGTG8gtIXrWEZ8nC/W3iLlKDrCuvTzClmGQ9075N5iwwcvOJYmyFDzP2axBg9TltbYhl0wwKQ== X-Received: by 2002:a05:6214:2681:b0:6d8:9610:a9ff with SMTP id 6a1803df08f44-6d8e70ef529mr131783696d6.1.1733684876945; Sun, 08 Dec 2024 11:07:56 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.07.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:07:56 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 5/9] Gitlab: Avoid downloading all artifacts in later stages Date: Sun, 8 Dec 2024 11:07:28 -0600 Message-ID: <20241208190741.4192601-6-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean In the test.py stage of the build we mark the pytest results as artifacts to save, so that they can be used for reports. This however leads to all of the artifacts being downloaded (and then not used) in later stages. Optimize this out by using an empty list of dependencies here (which is the keyword for which artifacts are needed). Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae9120655b0c..696d3cb1bd74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,6 +111,7 @@ stages: build all platforms in a single job: stage: world build + dependencies: [] rules: - when: always parallel: @@ -521,6 +522,7 @@ coreboot test.py: - if: $SJG_LAB != "1" when: manual allow_failure: true + dependencies: [] tags: [ 'lab' ] script: - if [[ -z "${SJG_LAB}" ]]; then From patchwork Sun Dec 8 17:07:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019786 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=obkjKo94; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vgY4nyvz1yRf for ; Mon, 9 Dec 2024 06:09:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD0C789647; Sun, 8 Dec 2024 20:08:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="obkjKo94"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E14D7895DD; Sun, 8 Dec 2024 20:08:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 686DF89578 for ; Sun, 8 Dec 2024 20:08:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-6d89a727a19so43068496d6.0 for ; Sun, 08 Dec 2024 11:08:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684878; x=1734289678; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BvRX292RCbNHBo7WSapkwDJbjBRvTdTitZ7TO4A2KIA=; b=obkjKo941AyGPDK7pR5yx5BHNPtaktF5Tm1YgIxS3szbWBjfLyI/XOx1pBIHUrT6SW oa6MbgTXhXMIcQB9fyzIj3jiCXl9k+jDu8SoPy/QBsm1adW9ZEojAgpgxUqordU1Uvjn ctsUQp/PvKJYUyU2idgqdlwC7tOvz3E0o5NdM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684878; x=1734289678; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BvRX292RCbNHBo7WSapkwDJbjBRvTdTitZ7TO4A2KIA=; b=SqYM3KTCDZIhha15HBOanpQELWtPiPY+43ODbGUCAB5fyGWmqBo8UbYwxHguLG1bTY doHSc2VdDBNvrdOI0bGJGphkdfp7O/QEUvhO+1CsDGWCnX5GwZivrUKnOjWbKlTUoEpD ZzCWMWd9hXQcXuwmv3VEeZpar4LOk+Rk4ZB0wNfkdMxe09aTxbJlQjqHjyMR5HEfIeEN a4DecNSOxreZk2U/5nyk0Rd3hXq3xiiA6fjjz6FU35Vp5MkvZCMzjuQXxC65pJhpap5C G2HRWSg/CAYgH2yULeZ5YVXS+Gh1ygSHYAyH9FaArKLmURzBLbeFwR2HK97mJQ9huFji SrWg== X-Gm-Message-State: AOJu0Yz4f8ldrofihMcNDrY/SX5m1Sw7kLozIHKSN1/F7YJFQhsv7T1+ O55fRQkHmto2UhVipRnQu4gfGeKZzXFxmoqwm3AiXRIDviHFxM+0MA8Wq/SZuoIw7VRclo9LFo1 jQUY= X-Gm-Gg: ASbGncsGSpBRVFnbvgeBHXGRqg2Xgn9o11RvP+JGfu+nUImNhJGpWXOUQl1AVNsF4aM xp34/+VCNGgZsRkg89WgYaJeWH4Qlki+n8hsfRnSx2jKm3ckwqi23nZMZ97HMCCglSh6WQ2gn/N z8i464OmyBujMmns1ILEfCE+JuNwn2NGauF+8KIK4uRf4MrsnfMy/gM3rrOlz4TdhFdHl7dYTMm IZ35ABvwAIIOEk+SJ7vKVOpXFKLrJ4njT99WN3TWIBYqUqqYW9cvoOh9QcDK+LMv+D31Q90VA== X-Google-Smtp-Source: AGHT+IFHcCA8BevsQOPF/iu8kRcJdKNcpzt1RsRbRx5qbQ9cemGF993i6pKWqLoy23iLdYfxgr8/aA== X-Received: by 2002:ad4:574e:0:b0:6d8:f6b0:bf52 with SMTP id 6a1803df08f44-6d8f6b0fdadmr140815956d6.16.1733684878365; Sun, 08 Dec 2024 11:07:58 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.07.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:07:57 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 6/9] docker: Ensure we use the cross toolchain for aarch64 on arm64 Date: Sun, 8 Dec 2024 11:07:29 -0600 Message-ID: <20241208190741.4192601-7-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean We do not want to use the host toolchain for building our platforms in CI (it is both too old, and would be inconsistent with our CI practices). To do this we need to set the toolchain-prefix so that we don't end up guessing "/opt/.../aarch64-linux-aarch64-linux-" as the prefix. Link: https://source.denx.de/u-boot/custodians/u-boot-dm/-/issues/32 Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- tools/docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 38a9c4b9ec69..5d77e2b62696 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -323,6 +323,9 @@ RUN /bin/echo -e "kernelorg = /opt/gcc-${TCVER}-nolibc/*" >> ~/.buildman RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; \ fi +RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ + /bin/echo -e "\n[toolchain-prefix]\naarch64 = /opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux-" >> ~/.buildman; \ + fi RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman RUN /bin/echo -e "\nx86 = i386" >> ~/.buildman; From patchwork Sun Dec 8 17:07:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019782 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=ObvvCy48; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vfr1wpDz1yRf for ; Mon, 9 Dec 2024 06:08:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4800889538; Sun, 8 Dec 2024 20:08:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="ObvvCy48"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9BB508954B; Sun, 8 Dec 2024 20:08:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 69497894AE for ; Sun, 8 Dec 2024 20:08:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-7b6c3b1ee59so104835585a.0 for ; Sun, 08 Dec 2024 11:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684879; x=1734289679; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WHlELdmKGzdhxcsd9zuaSJHWyH58fse7NExRX29a0T8=; b=ObvvCy48GTIt1FvV6VlLPNd7/1tFbI5KvYiQRdtv1Jegpp+e9KekwBPvwpAYbmO5gp WGdxo2ACx9X/LAUdOucbgqFVi83bTyOYVezHbIyaVsQ5o0cbxhlRyEQaS3fy37ErB2hZ M3ddXi/aVZMCk9C4A7J8khPnT2XDR5JE7wz+U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684879; x=1734289679; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WHlELdmKGzdhxcsd9zuaSJHWyH58fse7NExRX29a0T8=; b=pQ9cqAAe50Eek+N3oY/EJw+ttrpOvzCyWeBh5gBi+bR6NuODvss3GE1sRjS3Df9EMd P5rMwVaX/hpOPvMpao28cmw+NePSJTVnEXbDQhssiOLMKdAZgwwiMIANbaxP5YOy2tN7 KQrw0/3TjdJtk+pmlgrCVwWZop0RJFbFfsOL70cyo+qcqzv/cURoeU0rCCy3aP6LVkCr qemzDzOIdlF7S64yzyDRa5imMogw6dBuupifBxoX+EaWrFY5AY9QA7DVMMgX8ua/nMFv 1Vjz4fl/EcOSE0qGndZ4y+MJGlh+7jAWoLYhLBZZus3aN1vIYmCK6k/5BRbcjo7Fn81v ThzA== X-Gm-Message-State: AOJu0YyW+WGcWVArjpCheOxGehefIWxwFT3cIzyBu9TZRFeb99eyKW3M 4cfwCQU0bWhp+qgpxsmdbuq1Cep1ih1Jfw+hwSsYqx7zptKe/umsAWVswsnzOgtsV40PPXTFXAb gR2w= X-Gm-Gg: ASbGncs1MnyxAkuSTMDL5QVXskbKJGF5La/A28uFuXCMza+Qt+RUL3Sh+JJ5t3CmzvP c61go6bMsADT4UoFpNyVz0BS5stM5de2tsc6G0nyuhHrarSWoZyjjAQ0iM+913R2I4JFJaO4m+B 2P4esWArcnc+ksr4tx0/C8sqwYgqg763Rdjf/St/OfuWpbzYD2rrYb0nvqsgsFricfLt01GQ7Hb PEHLuZl5M/UyIS1jfTVuNnW7lafOCJBXtoE9kezS+aAIEFO6vS9WsjLKJYhxKdCcDpjGkFmPQ== X-Google-Smtp-Source: AGHT+IEJ7f95jcZxMSvg4bplgX9QFg4a/gzJC/sFpl5DvTDyIpZtp9TSe3osvJrsaVllv+J/+8Xb/w== X-Received: by 2002:a05:620a:1d0b:b0:7b6:d237:abf4 with SMTP id af79cd13be357-7b6d237ae37mr352328285a.39.1733684879372; Sun, 08 Dec 2024 11:07:59 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.07.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:07:58 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 7/9] docker: Prefer the kernelorg toolchains over "root" Date: Sun, 8 Dec 2024 11:07:30 -0600 Message-ID: <20241208190741.4192601-8-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean We should always look in our downloaded toolchains first and then for host-provided toolchains. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- tools/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 5d77e2b62696..348605a2b6a3 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -318,8 +318,8 @@ RUN virtualenv -p /usr/bin/python3 /tmp/venv && \ rm -rf /tmp/venv /tmp/*-requirements.txt # Create the buildman config file -RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman -RUN /bin/echo -e "kernelorg = /opt/gcc-${TCVER}-nolibc/*" >> ~/.buildman +RUN /bin/echo -e "[toolchain]\nkernelorg = /opt/gcc-${TCVER}-nolibc/*" > ~/.buildman +RUN /bin/echo -e "root = /usr" >> ~/.buildman RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; \ fi From patchwork Sun Dec 8 17:07:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019784 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=pIT/2SO0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vgC44vSz1yRf for ; Mon, 9 Dec 2024 06:09:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1AC6B895DD; Sun, 8 Dec 2024 20:08:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="pIT/2SO0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 231D9893D6; Sun, 8 Dec 2024 20:08:04 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E5D8889541 for ; Sun, 8 Dec 2024 20:08:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-467631f3ae3so1755211cf.0 for ; Sun, 08 Dec 2024 11:08:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684881; x=1734289681; darn=lists.denx.de; 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=TDvNaabWhKkWhwpY1kPtX3noWnH2Byfq+SHtaSFhw0g=; b=pIT/2SO0Vy3/x+CGDO1xWVdt/D3hzwZjSbcupebtQ7hRUif7e5MKpvAb7eOMVCq36H zcDloGMwum0NfMTpTSUapwWLFbSJ4/NYxyOGWb7JO4ahg01WH0T+x2VSUMQPm+2hqsro G3PvwSFUf0wznExUS22SLV39iwTECdMS1QFIo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684881; x=1734289681; 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=TDvNaabWhKkWhwpY1kPtX3noWnH2Byfq+SHtaSFhw0g=; b=lGDcx3QY2u8GbK6gYRD8k466fFDTvUi4na1qzeV6cKCHe0SxwoyPoFcK6Yd/qlVogr /899x21fnNuImbGH87MWgvYh757dU9Oww/XVZ9L2N0EjqgtJgDK1q4jdcETF8vMVZsG+ feFoL39hQkeswXUJRAjc562FAuBJ6uNJRl3dV8zYvd9O5HtZWwOIuZNZLQnRvX9kfgAf tGTaH9hUIJILPs8WsNbGdyBuhbVIVU0fm2CyaxVVtAQ17DhezDJOuDmZp+YfNOdtEliA N6BJ5sHTkyySDqJAH8x/dYqjM2M3aP3DOFnCP6MPs6Pyl27GR+BNvliwCfsO9qB0x+wf j+yA== X-Gm-Message-State: AOJu0Yz3eldoSzzA7XUMMDsAjmAN9Ht0sAh8K8qpGrgI4B0QRNaHyOn5 M2X9LJVQzZ+ZFxao+VAY0JgDW2YBTbUtEDwHRfwhxXxybNBOeYE+ucX+7z1TVh0DaAmqk44ugVd i0Bc= X-Gm-Gg: ASbGncsWoipQir2LJQ/3JM7uO+IFL+hNR1ghiJVezgombmAh8X1S5vfJ9hd7Kn+up/q EA8VSfbccaVAHbaGKc5L79azZqdxTtiNiteWaI0w9BjaDkKAmA4v5terck0sBWFc2771okUL/PC iMcIiLrIXUvCNqzZmAOUfBDcImMi2u9w3ZcS/Auke2L5JzuJ7K+dcJcKOg7jb7rqJ66yuGdodGj NwTZWX48rEbNYupCpG9U36JLuYruNdSUEaNF0DUtmhH2kuiftcB8ZReZzznLqehgVh+aooy9g== X-Google-Smtp-Source: AGHT+IG0TA0qHjnIqVkAYocMoM1wHJHJoimpc3Hx1wfT6/KstVc9EZ/dAvfw065db4zbAUe5ySQ0HA== X-Received: by 2002:a05:6214:c82:b0:6d8:96a6:ec27 with SMTP id 6a1803df08f44-6d8e71a62camr161049496d6.35.1733684880870; Sun, 08 Dec 2024 11:08:00 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:08:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [PATCH 8/9] doc: Expand what we say about building the docker container a bit Date: Sun, 8 Dec 2024 11:07:31 -0600 Message-ID: <20241208190741.4192601-9-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean First, try and be slightly clearer about what "buildx" is with respect to the docker build process. Second, now that we build the container for both amd64 and arm64, we should document how to make a docker "builder" that has multiple nodes. With this one node should be amd64 and one node arm64, and with reasonably fast arm64 hardware this will be much quicker than using QEMU. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- Cc: Simon Glass --- doc/build/docker.rst | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/build/docker.rst b/doc/build/docker.rst index 5896dd5ac4a6..01ed35050908 100644 --- a/doc/build/docker.rst +++ b/doc/build/docker.rst @@ -4,21 +4,29 @@ GitLab CI / U-Boot runner container In order to have a reproducible and portable build environment for CI we use a container for building in. This means that developers can also reproduce the CI environment, to a large degree at least, locally. This file is located in the tools/docker directory. The docker image supports both amd64 and arm64. Ensure that the -'docker-buildx' Debian package is installed (or the equivalent on another -distribution). +`buildx` Docker CLI plugin is installed. This is often available in your +distribution via the 'docker-buildx' or 'docker-buildx-plugin' package. You will need a multi-platform container, otherwise this error is shown:: ERROR: Multi-platform build is not supported for the docker driver. Switch to a different driver, or turn on the containerd image store, and try again. -You can add one with:: +You can add a simple one with:: sudo docker buildx create --name multiarch --driver docker-container --use -Building is supported on both amd64 (i.e. 64-bit x86) and arm64 machines. While -both amd64 and arm64 happen in parallel, the non-native part will take -considerably longer as it must use QEMU to emulate the foreign code. +This will result in a builder that will use QEMU for the non-native +architectures request in a build. While both amd64 and arm64 happen in +parallel, the non-native part will take considerably longer as it must use QEMU +to emulate the foreign code. An alternative, if you have accesss to reasonably +fast amd64 (i.e. 64-bit x86) and arm64 machines is:: + + sudo docker buildx create --name multiarch-multinode --node localNode --bootstrap --use + sudo docker buildx create --name multiarch-multinode --append --node remoteNode --bootstrap ssh://user@host + +And this will result in a builder named multiarch-multinode that will build +each platform natively on each node. To build the image yourself:: From patchwork Sun Dec 8 17:07:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2019785 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=no7xLaPW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5vgN5FLZz1yRf for ; Mon, 9 Dec 2024 06:09:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 74FF1895E6; Sun, 8 Dec 2024 20:08:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="no7xLaPW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AAC45895DA; Sun, 8 Dec 2024 20:08:05 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 76088894AE for ; Sun, 8 Dec 2024 20:08:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-6d8918ec243so39183406d6.1 for ; Sun, 08 Dec 2024 11:08:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1733684882; x=1734289682; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IUtd5i/t/7Xt6Go7yYLDif3wjjGIrQO8/pcCIp7Ya3g=; b=no7xLaPWVX4o4dvmqAxLK2Z2zrL2/lZyFY/xF0poXx4G9EKh/H7ar3rcFkbCHHOPxJ H7FKNzU8P5GUidVKzmDAQzd7nDYiqjHJdlnnKUrPlM8IadCmZWpQ63vZD4umS5V5k8/D 9GT68OrldvuKCIiK7wVP/WCaCBgze3GJL1/wg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733684882; x=1734289682; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IUtd5i/t/7Xt6Go7yYLDif3wjjGIrQO8/pcCIp7Ya3g=; b=gti3N2esg4cCvqnus0fYs/hWkzlgkCANnlamw3hB3KSDvlYmcLEneKC6WkPmWbBp4D Bukuk68gz4GvbEmIbltmIbSf5jlmkLsHQwLXvatk4CoHy7qtw0pYCwAg/bPWWy39m2cH hR0kwRzaWjG1+k0UYxB/mHgStVAXfEDl3dXbBqVhXKPTbDn7mKlScSMPWqklFoWF6qAo zzNElMIXwUzCDEsPLy1hSAHsLxNrxNoExYa2C6b2eX5KbCVRv+IHOORNd07HjxnOCw8Y JZEwDieGgZyWuwVUoqatLV4C+6bZU7I+9HTePwTxQp4MtRPoJ7p8RAh4U9tOICbhRX8x 6Mow== X-Gm-Message-State: AOJu0Yx5uq4PKXZ4g8pQJCjzR2nUPKPzWxEKJJ5zZF+D7GIjqvMo9Qel uMEY9k0sFVy8wPUb+BZuOy7vMyFRo8LPEQU1b0CWH+fFrdmuyR8+aT5SrxgGg4MRc3JgKGxJIU3 fTww= X-Gm-Gg: ASbGncsq1zEBxwb8xEmuF8upQKmB17LZacjXNTT06MVbCFdEI4xGYKpvaaY5xZvDRxR BHKhwRK21cFQSszUPaf5mNSiVU/3XQK3rGxu0PVwDZjMw471Avy2CZ6Y/ZPfSuO+1WHBE0OQ0Iq XfMDzthcVQh6Q/hjAiCnZnrHpEXieC7FyVueWjcqBw+Z5opXzWrjNEtk5SVxZz33GqF6yAQrZqu OxV8iTZw1wsvsBls4Wnr7mbbnLFeQdeloer/1rHqnFYdysT/dv6GmAena2NqlpXPXEyEPSzkA== X-Google-Smtp-Source: AGHT+IE4e+TWZt5/NEOJ+OGhIWyGzPFhgpcs8+ADh0vGd82U9gh/pAlyyheFVO1UX89dNzZUOgc0Wg== X-Received: by 2002:a05:6214:21ac:b0:6d8:a32e:8430 with SMTP id 6a1803df08f44-6d8e70a4538mr176198336d6.8.1733684882293; Sun, 08 Dec 2024 11:08:02 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([189.177.125.100]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da66ddeasm41154076d6.25.2024.12.08.11.08.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 11:08:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 9/9] docker: Update to latest "Jammy" tag Date: Sun, 8 Dec 2024 11:07:32 -0600 Message-ID: <20241208190741.4192601-10-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241208190741.4192601-1-trini@konsulko.com> References: <20241208190741.4192601-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Bring us up to the current Ubuntu "Jammy" tag. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index c577a724c82b..df3f82074af0 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: windows-2022 ubuntu_vm: ubuntu-24.04 macos_vm: macOS-14 - ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20240808-03Dec2024 + ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20240911.1-08Dec2024 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 696d3cb1bd74..a7bae035319c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ workflow: # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240808-03Dec2024 +image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240911.1-08Dec2024 # We run some tests in different order, to catch some failures quicker. stages: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 348605a2b6a3..d2848ab85f35 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:jammy-20240808 +FROM ubuntu:jammy-20240911.1 LABEL org.opencontainers.image.authors="Tom Rini " LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container"