From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 22 Aug 2024 13:54:26 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sh6OY-00CEhh-0D for lore@lore.pengutronix.de; Thu, 22 Aug 2024 13:54:26 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sh6OX-0004VH-FE for lore@pengutronix.de; Thu, 22 Aug 2024 13:54:25 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=N+RRcQKW2Mgzs3eASVxPq6ONxyTNe+1oUUBY8dGVvVM=; b=xhN8Iqu38/pjdGMXvtTfQd4dVh SyNEVvhZv6TLDHytMTrfg6VIBXWplYQw0tZYDBeHsJS/kYLkeB81gCgLqQr1MULlC/eZjauNrm7oD N/ORvHg/MmGlHdSbrvCkkyH1JLF+ZlJV0Haaw0ppjMnkYSr2IoyR1im6n212+Tm98MqVbUG9iLP1/ Pz+kLeueJfRlPCO2EOCKLocyL7PNKeSRClZsPbUTUhWpyroRY54Frpd5Pnf+5ImouBjJtLqaXLXIh a5wX9PQHz9JCM34Dw+G/wgTE2fvfE0mSMW4j2Rb1ZqKSr0HsOcjx28u3OCXnFKKrTSCM0F7XFxBin dpKxl/UA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sh6Nt-0000000Cea3-06Ed; Thu, 22 Aug 2024 11:53:45 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sh6Nq-0000000CeY3-1L1Z for barebox@lists.infradead.org; Thu, 22 Aug 2024 11:53:43 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sh6Nm-0004NX-Lt; Thu, 22 Aug 2024 13:53:38 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sh6Nm-002Ewu-8V; Thu, 22 Aug 2024 13:53:38 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1sh6Nm-004wag-0V; Thu, 22 Aug 2024 13:53:38 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Thu, 22 Aug 2024 13:53:36 +0200 Message-Id: <20240822115337.1178520-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240822_045342_377087_8084E094 X-CRM114-Status: UNSURE ( 9.53 ) X-CRM114-Notice: Please train this message. X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH master] ci: container: fix CROSS_COMPILE_openrisc to point at correct version X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Due to the test failing with the latest 14.2.0 release, we are downgrading OpenRISC to the old GCC 13.1.0 version as an interim measure. The patch doing this was faulty and while it downloaded the older toolchain, the CROSS_COMPILE_openrisc variable still referenced the 14.2.0 toolchain breaking MAKEALL. Fixes: 6d4c6b01f4c4 ("ci: container: downgrade OpenRISC toolchain from 14.2.0 to 13.1.0") Signed-off-by: Ahmad Fatoum --- This is hopefully the last patch needed to make CI green again. --- test/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Containerfile b/test/Containerfile index 97182ccb29ed..1c4932f56a64 100644 --- a/test/Containerfile +++ b/test/Containerfile @@ -83,7 +83,7 @@ RUN cd /tmp && \ ENV CROSS_COMPILE_arm=/opt/gcc-${GCC_VERSION}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- ENV CROSS_COMPILE_arm64=/opt/gcc-${GCC_VERSION}-nolibc/aarch64-linux/bin/aarch64-linux- ENV CROSS_COMPILE_mips=/opt/gcc-${GCC_VERSION}-nolibc/mips-linux/bin/mips-linux- -ENV CROSS_COMPILE_openrisc=/opt/gcc-${GCC_VERSION}-nolibc/or1k-linux/bin/or1k-linux- +ENV CROSS_COMPILE_openrisc=/opt/gcc-13.1.0-nolibc/or1k-linux/bin/or1k-linux- ENV CROSS_COMPILE_powerpc=/opt/gcc-${GCC_VERSION}-nolibc/powerpc-linux/bin/powerpc-linux- ENV CROSS_COMPILE_riscv=/opt/gcc-${GCC_VERSION}-nolibc/riscv64-linux/bin/riscv64-linux- ENV CROSS_COMPILE_kvx=/opt/gcc-kalray-kvx-v5.0.0/bin/kvx-elf- -- 2.39.2