From patchwork Mon Jan 27 15:39:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Enrico_J=C3=B6rns?= X-Patchwork-Id: 56159 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E42FC0218A for ; Mon, 27 Jan 2025 15:40:31 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) by mx.groups.io with SMTP id smtpd.web10.54588.1737992428609449238 for ; Mon, 27 Jan 2025 07:40:28 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: pengutronix.de, ip: 185.203.201.7, mailfrom: ejo@pengutronix.de) 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 1tcRDm-0005qm-SD; Mon, 27 Jan 2025 16:40:18 +0100 Received: from dude06.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::5c]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tcRDm-0029F5-0z; Mon, 27 Jan 2025 16:40:18 +0100 Received: from ejo by dude06.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tcRDm-002qYN-0p; Mon, 27 Jan 2025 16:40:18 +0100 From: =?utf-8?q?Enrico_J=C3=B6rns?= To: openembedded-core@lists.openembedded.org Cc: yocto@pengutronix.de, Ahmad Fatoum Subject: [PATCH v2 1/2] barebox: drop patch file left over during last upgrade Date: Mon, 27 Jan 2025 16:39:43 +0100 Message-Id: <20250127153944.676370-1-ejo@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ejo@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: openembedded-core@lists.openembedded.org List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 27 Jan 2025 15:40:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210303 The patch was removed from SRC_URI but not deleted from the directory tree. Fixes: 3291a8fa ("barebox: upgrade 2024.10.0 -> 2024.12.0") Signed-off-by: Enrico Jörns --- ...0001-lib-lz4-use-lz4-instead-of-lz4c.patch | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 meta/recipes-bsp/barebox/barebox/0001-lib-lz4-use-lz4-instead-of-lz4c.patch diff --git a/meta/recipes-bsp/barebox/barebox/0001-lib-lz4-use-lz4-instead-of-lz4c.patch b/meta/recipes-bsp/barebox/barebox/0001-lib-lz4-use-lz4-instead-of-lz4c.patch deleted file mode 100644 index 55d4a4556b..0000000000 --- a/meta/recipes-bsp/barebox/barebox/0001-lib-lz4-use-lz4-instead-of-lz4c.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 24839df617aef8099e4d1ba3fc47a04c52c0cf75 Mon Sep 17 00:00:00 2001 -From: Justin Bronder -Date: Wed, 6 Nov 2024 11:59:40 -0500 -Subject: [PATCH] lib: lz4: use lz4 instead of lz4c - -lz4c has been considered deprecated by upstream since at least 2018 [1] -and has been disabled by default recently [2]. openSUSE Tumbleweed is -no longer packaging the deprecated version and others will likely -follow. - -Going back as far as Ubuntu 16.04/Fedora 25, both lz4 and lz4c are -installed as part of the same package so switching should be safe. - -1. https://github.com/lz4/lz4/pull/553 -2. https://github.com/lz4/lz4/pull/1479 - -Upstream-Status: Submitted [http://lists.infradead.org/pipermail/barebox/2024-November/048491.html] -Signed-off-by: Justin Bronder ---- - scripts/Makefile.lib | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 1881e3c1..1052bcee 100644 ---- a/scripts/Makefile.lib -+++ b/scripts/Makefile.lib -@@ -492,7 +492,7 @@ cmd_lzo = (cat $(filter-out FORCE,$^) | \ - - quiet_cmd_lz4 = LZ4 $@ - cmd_lz4 = (cat $(filter-out FORCE,$^) | \ -- lz4c -l -c1 stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ -+ lz4 -l --best stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ - (rm -f $@ ; false) - - %.lz4: % From patchwork Mon Jan 27 15:39:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Enrico_J=C3=B6rns?= X-Patchwork-Id: 56160 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EA8EC0218C for ; Mon, 27 Jan 2025 15:40:31 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) by mx.groups.io with SMTP id smtpd.web10.54581.1737992421124645543 for ; Mon, 27 Jan 2025 07:40:21 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: pengutronix.de, ip: 185.203.201.7, mailfrom: ejo@pengutronix.de) 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 1tcRDm-0005qn-SD; Mon, 27 Jan 2025 16:40:18 +0100 Received: from dude06.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::5c]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tcRDm-0029F6-11; Mon, 27 Jan 2025 16:40:18 +0100 Received: from ejo by dude06.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tcRDm-002qYQ-0s; Mon, 27 Jan 2025 16:40:18 +0100 From: =?utf-8?q?Enrico_J=C3=B6rns?= To: openembedded-core@lists.openembedded.org Cc: yocto@pengutronix.de, Ahmad Fatoum Subject: [PATCH v2 2/2] barebox: upgrade 2024.12.0 -> 2025.01.0 Date: Mon, 27 Jan 2025 16:39:44 +0100 Message-Id: <20250127153944.676370-2-ejo@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250127153944.676370-1-ejo@pengutronix.de> References: <20250127153944.676370-1-ejo@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ejo@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: openembedded-core@lists.openembedded.org List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 27 Jan 2025 15:40:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210302 Changes: * Added LLVM/Clang support for the sandbox architecture. * Enabled command execution from the sandbox command line. * Improved TFTP with dentry caching and default-disabled window size. * Introduced hardening features: register zeroing, stack variable initialization, and malloc buffer zeroing. * Enhanced AM625 support with network support, watchdog driver, and bootsource detection. Changelog: https://lore.barebox.org/barebox/Z4oUYdHXEAtnkySC@pengutronix.de/T/#u Also adds a new patch created for fixing barebox-tools build with musl. Signed-off-by: Enrico Jörns --- v1 -> v2: * added barebox patch file to fix musl build (by Ahmad Fatoum) * minor wording change in 'Changes' [* added patch to remove old barebox .patch file] meta/recipes-bsp/barebox/barebox-common.inc | 6 +- ...linux-types.h-define-loff_t-for-musl.patch | 57 +++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-bsp/barebox/files/0001-scripts-include-linux-types.h-define-loff_t-for-musl.patch diff --git a/meta/recipes-bsp/barebox/barebox-common.inc b/meta/recipes-bsp/barebox/barebox-common.inc index fce3b825ae..13f1d81289 100644 --- a/meta/recipes-bsp/barebox/barebox-common.inc +++ b/meta/recipes-bsp/barebox/barebox-common.inc @@ -3,6 +3,8 @@ SECTION = "bootloaders" LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" -PV = "2024.12.0" +PV = "2025.01.0" SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2" -SRC_URI[sha256sum] = "717a2416b37942f584b0bb2eb61ccbf85dc0f1a5c841318f47cd6967b9c4dcab" +SRC_URI[sha256sum] = "288a838e6fe8897ea46dabd112e42287177353c88a7d442cefc8be8d1a85f5b5" + +SRC_URI += "file://0001-scripts-include-linux-types.h-define-loff_t-for-musl.patch" diff --git a/meta/recipes-bsp/barebox/files/0001-scripts-include-linux-types.h-define-loff_t-for-musl.patch b/meta/recipes-bsp/barebox/files/0001-scripts-include-linux-types.h-define-loff_t-for-musl.patch new file mode 100644 index 0000000000..bce9d2ebf5 --- /dev/null +++ b/meta/recipes-bsp/barebox/files/0001-scripts-include-linux-types.h-define-loff_t-for-musl.patch @@ -0,0 +1,57 @@ +From e46f4add079bbae4ac0926ed113e393786e89bef Mon Sep 17 00:00:00 2001 +From: Ahmad Fatoum +Date: Mon, 27 Jan 2025 15:31:46 +0100 +Subject: [PATCH] scripts: include/linux/types.h: define loff_t for musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +musl doesn't define loff_t, but glibc does and both of them define +__linux__. This leads to build errors with musl when code makes it into +scripts/ that uses loff_t. This was already fixed once e.g. in commit +c0d065fb0aa0 ("scripts: bareboximd: remove usage of loff_t"). + +Instead of playing whack-a-mole in future, let's just define loff_t +for non-glibc builds of scripts/. + +Also, make sure is always included for scripts/common.h, +which is the only header currently making use of loff_t. + +Fixes: 5171f4d0696f ("scripts: implement read_fd and pread_full for tools") +Upstream-Status: Submitted [https://lore.barebox.org/barebox/20250127143146.2965544-1-a.fatoum@pengutronix.de/T/#u] +Reported-by: Enrico Jörns +Signed-off-by: Ahmad Fatoum +--- + scripts/common.h | 2 ++ + scripts/include/linux/types.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/scripts/common.h b/scripts/common.h +index a0d16606b5..21ec576a5b 100644 +--- a/scripts/common.h ++++ b/scripts/common.h +@@ -1,6 +1,8 @@ + #ifndef __COMMON_H + #define __COMMON_H + ++#include ++ + int read_file_2(const char *filename, size_t *size, void **outbuf, size_t max_size); + void *read_file(const char *filename, size_t *size); + void *read_fd(int fd, size_t *out_size); +diff --git a/scripts/include/linux/types.h b/scripts/include/linux/types.h +index e81d7e8101..02a330cd4e 100644 +--- a/scripts/include/linux/types.h ++++ b/scripts/include/linux/types.h +@@ -14,7 +14,7 @@ typedef int16_t __s16; + typedef uint8_t __u8; + typedef int8_t __s8; + +-#ifndef __linux__ ++#ifndef __GLIBC__ + typedef long long loff_t; + #endif + +-- +2.39.5 +