From 29af0f1b0c623d18e29bddd836b18d7a2badaffb Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Thu, 27 Feb 2025 16:36:20 +0000 Subject: [PATCH 01/88] package/shadow: bump to version 4.17.3 Changelog: [1] [2] [3] [4]. [1]: https://github.com/shadow-maint/shadow/releases/tag/4.17.3 [2]: https://github.com/shadow-maint/shadow/releases/tag/4.17.2 [3]: https://github.com/shadow-maint/shadow/releases/tag/4.17.1 [4]: https://github.com/shadow-maint/shadow/releases/tag/4.17.0 Signed-off-by: Raphael Pavlidis Signed-off-by: Julien Olivain --- package/shadow/shadow.hash | 4 ++-- package/shadow/shadow.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 7155baff07..6e7fdb4603 100644 --- a/package/shadow/shadow.hash +++ b/package/shadow/shadow.hash @@ -1,4 +1,4 @@ -# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc +# Verified from https://github.com/shadow-maint/shadow/releases/download/4.17.3/shadow-4.17.3.tar.xz.asc # with key 66D0387DB85D320F8408166DB175CFA98F192AF2 -sha256 b78e3921a95d53282a38e90628880624736bf6235e36eea50c50835f59a3530b shadow-4.16.0.tar.xz +sha256 09e896c7b01c97ba4be2d6be332c55a3e478b4893cd3c3466d8224e622bd4943 shadow-4.17.3.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index f0a2b57b4d..cea984012d 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.16.0 +SHADOW_VERSION = 4.17.3 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause From a639e31268ba5483b607b32b32896346f62509d6 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 17 Feb 2025 16:31:22 +0100 Subject: [PATCH 02/88] package/nftables: add init script The init script handles an nftables ruleset file with support for atomic reloading. By default the ruleset is expected in /etc/nftables.conf, the location can be changed in /etc/default/nftables. If the ruleset file does not exist, the script does nothing and shows a warning about that fact. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- package/nftables/S35nftables | 76 ++++++++++++++++++++++++++++++++++++ package/nftables/nftables.mk | 5 +++ 2 files changed, 81 insertions(+) create mode 100644 package/nftables/S35nftables diff --git a/package/nftables/S35nftables b/package/nftables/S35nftables new file mode 100644 index 0000000000..35b089e154 --- /dev/null +++ b/package/nftables/S35nftables @@ -0,0 +1,76 @@ +#!/bin/sh + +DAEMON="nftables" + +# Main ruleset file, override in /etc/default/nftables if you want a +# different location. The file should include a "flush ruleset" +# command to atomically replace any previous rules on reload (instead +# of adding to them). +NFTABLES_CONFIG="/etc/nftables.conf" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +# Run only if the ruleset file exists. +if [ ! -f "${NFTABLES_CONFIG}" ]; then + echo "${NFTABLES_CONFIG} does not exist, nothing to do." + exit 0 +fi + +start() { + printf "Loading nftables rules: " + /usr/sbin/nft --file "${NFTABLES_CONFIG}" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf "Clearing nftables rules: " + /usr/sbin/nft flush ruleset + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +reload() { + FLUSH='flush ruleset' + if ! grep -q -x "$FLUSH" "${NFTABLES_CONFIG}"; then + printf 'WARNING: no "%s" in %s, duplicated rules likely\n' \ + "$FLUSH" "${NFTABLES_CONFIG}" + fi + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + reload) + reload + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +exit $? diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index c958f0eb26..380e553cde 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -57,6 +57,11 @@ define NFTABLES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_INET) endef +define NFTABLES_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/nftables/S35nftables \ + $(TARGET_DIR)/etc/init.d/S35nftables +endef + $(eval $(autotools-package)) # Legacy: we used to handle it in this .mk From 2625440614b6000109ff1c8fc3a64e5b92d90f77 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 17 Feb 2025 16:31:23 +0100 Subject: [PATCH 03/88] package/iptables: optionally default to nftables compat For an nftables-based firewall setup it may be desirable to use iptables-nft as the "iptables" binary, in particular to better integrate legacy applications that do not support nftables directly and call iptables. If the BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT option introduced by this patch is enabled, iptables, iptables-restore, and iptables-save are symlinked to the -nft version of iptables. The -legacy options can still be called directly if desired. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- package/iptables/Config.in | 12 ++++++++++++ package/iptables/iptables.mk | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/package/iptables/Config.in b/package/iptables/Config.in index e6b12603e0..ef02c26242 100644 --- a/package/iptables/Config.in +++ b/package/iptables/Config.in @@ -24,6 +24,18 @@ config BR2_PACKAGE_IPTABLES_NFTABLES help Build nftables compat utilities. +if BR2_PACKAGE_IPTABLES_NFTABLES + +config BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT + bool "use nftables compat by default" + help + Make the nftables compat variant of iptables, iptables-save, + and iptables-restore the default. This only adjusts symlinks + in /usr/sbin, the legacy variants can still be called + directly. + +endif + comment "nftables compat needs a toolchain w/ wchar, dynamic library, headers >= 3.12" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 533f56a992..8d23dca249 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -62,4 +62,16 @@ define IPTABLES_INSTALL_INIT_SYSV touch $(TARGET_DIR)/etc/iptables.conf endef +ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT),y) +define IPTABLES_MAKE_NFTABLES_DEFAULT + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/iptables + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/iptables-restore + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/iptables-save + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/ip6tables + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/ip6tables-save +endef +IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_MAKE_NFTABLES_DEFAULT +endif + $(eval $(autotools-package)) From 475722ea46fdd18ea5859b44954da9267762d8a4 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 17 Feb 2025 16:31:24 +0100 Subject: [PATCH 04/88] package/iptables: check for rules in init script Instead of installing an empty rules file, the init script now checks if the rules file exists and does nothing if it doesn't. The "save" action is exempt from that limit because it may be used to create the rules file. Also fix the shellcheck warning about the unused IPTABLES_ARGS variable, and use long form options for iptables commands. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - package/iptables/S35iptables | 16 +++++++++++----- package/iptables/iptables.mk | 1 - 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 66b3e100bb..e97d2ebdf9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -584,7 +584,6 @@ package/ipmitool/0002-Fix-enterprise-numbers-URL.patch lib_patch.Upstream package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch lib_patch.Upstream package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch lib_patch.Upstream package/iprutils/0001-configure.ac-add-AC_USE_SYSTEM_EXTENSIONS.patch lib_patch.Upstream -package/iptables/S35iptables Shellcheck package/irda-utils/0001-daemon.patch lib_patch.Sob lib_patch.Upstream package/irda-utils/0002-nommu.patch lib_patch.Sob lib_patch.Upstream package/irda-utils/0003-subdir.patch lib_patch.Sob lib_patch.Upstream diff --git a/package/iptables/S35iptables b/package/iptables/S35iptables index a2de29d222..fc42fc9a8c 100644 --- a/package/iptables/S35iptables +++ b/package/iptables/S35iptables @@ -2,11 +2,18 @@ DAEMON="iptables" -IPTABLES_ARGS="" +IPTABLES_CONF="/etc/iptables.conf" + +# Run only if IPTABLES_CONF exists, except when the action is "save" +# (which creates it). +if [ ! -f "${IPTABLES_CONF}" ] && [ "$1" != "save" ]; then + echo "${IPTABLES_CONF} does not exist, nothing to do." + exit 0 +fi start() { printf 'Starting %s: ' "$DAEMON" - iptables-restore /etc/iptables.conf + iptables-restore "$IPTABLES_CONF" status=$? if [ "$status" -eq 0 ]; then echo "OK" @@ -18,7 +25,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - iptables -F + iptables --flush status=$? if [ "$status" -eq 0 ]; then echo "OK" @@ -30,13 +37,12 @@ stop() { restart() { stop - sleep 1 start } save() { printf 'Saving %s: ' "$DAEMON" - iptables-save -f /etc/iptables.conf + iptables-save --file "$IPTABLES_CONF" status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 8d23dca249..a9d912f6cc 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -59,7 +59,6 @@ endef define IPTABLES_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/iptables/S35iptables \ $(TARGET_DIR)/etc/init.d/S35iptables - touch $(TARGET_DIR)/etc/iptables.conf endef ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT),y) From 1af307504a4f1e7ed9704ae14cae49ce82fa8a00 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 17 Feb 2025 16:31:25 +0100 Subject: [PATCH 05/88] support/testing: test for nftables init script The new test checks that a pre-defined rules file can be loaded and works as expected, and that after flushing the blocked IP responds to ping again. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + .../testing/tests/package/test_nftables.py | 37 ++++++++++++++++++- .../rootfs-overlay/etc/nftables.conf | 8 ++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 support/testing/tests/package/test_nftables/rootfs-overlay/etc/nftables.conf diff --git a/DEVELOPERS b/DEVELOPERS index 1f04dd2a1e..25cb5dc764 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1110,6 +1110,7 @@ F: package/python-poetry-dynamic-versioning/ F: package/python-pyasynchat/ F: package/python-pyasyncore/ F: support/testing/tests/package/sample_python_networkmanager_goi.py +F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_python_networkmanager_goi.py N: Flávio Tapajós diff --git a/support/testing/tests/package/test_nftables.py b/support/testing/tests/package/test_nftables.py index 142e7d0352..2622c7e822 100644 --- a/support/testing/tests/package/test_nftables.py +++ b/support/testing/tests/package/test_nftables.py @@ -85,7 +85,7 @@ class TestNftables(infra.basetest.BRTest): # supposed to fail earlier is now supposed to succeed. self.assertRunOk(ping_test_cmd) - def test_run(self): + def boot_vm(self): img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") kern = os.path.join(self.builddir, "images", "Image") self.emulator.boot(arch="aarch64", @@ -97,6 +97,9 @@ class TestNftables(infra.basetest.BRTest): "-initrd", img]) self.emulator.login() + def test_run(self): + self.boot_vm() + # We check the program can execute. self.assertRunOk("nft --version") @@ -107,3 +110,35 @@ class TestNftables(infra.basetest.BRTest): # We run again the same test sequence using our simple nft # python implementation, to check the language bindings. self.nftables_test(prog="/root/nft.py") + + +class TestNftablesInit(TestNftables): + config = TestNftables.config + \ + """ + BR2_INIT_BUSYBOX=y + """ + + def test_run(self): + self.boot_vm() + + # start with known state (rules from /etc/nftables.conf) + self.assertRunOk("/etc/init.d/S35nftables reload") + + # Same concept as in TestNftables.nftables_test: The rules + # should allow ping to 127.0.0.1, but not 127.0.0.2. + ping_cmd_prefix = "ping -c 3 -i 0.5 -W 2 " + self.assertRunOk(ping_cmd_prefix + "127.0.0.1") + _, exit_code = self.emulator.run(ping_cmd_prefix + "127.0.0.2") + self.assertNotEqual(exit_code, 0) + + # Stop should flush the rules, ping to both addresses should + # work now. + self.assertRunOk("/etc/init.d/S35nftables stop") + self.assertRunOk(ping_cmd_prefix + "127.0.0.1") + self.assertRunOk(ping_cmd_prefix + "127.0.0.2") + + # Start is essentially the same as reload, check that + # 127.0.0.2 gets blocked again. + self.assertRunOk("/etc/init.d/S35nftables start") + _, exit_code = self.emulator.run(ping_cmd_prefix + "127.0.0.2") + self.assertNotEqual(exit_code, 0) diff --git a/support/testing/tests/package/test_nftables/rootfs-overlay/etc/nftables.conf b/support/testing/tests/package/test_nftables/rootfs-overlay/etc/nftables.conf new file mode 100644 index 0000000000..a04af1d634 --- /dev/null +++ b/support/testing/tests/package/test_nftables/rootfs-overlay/etc/nftables.conf @@ -0,0 +1,8 @@ +flush ruleset + +table inet filter { + chain input { + type filter hook input priority filter; policy accept; + ip daddr 127.0.0.2 icmp type echo-request drop + } +} From 1b9bba85999b5840e5804a2f5d672c7a8d24792e Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 17 Feb 2025 16:31:26 +0100 Subject: [PATCH 06/88] support/testing: include init script in iptables test Check a save/start/stop cycle based on the rules created by direct commands in the pre-existing test. Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- support/testing/tests/package/test_iptables.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/support/testing/tests/package/test_iptables.py b/support/testing/tests/package/test_iptables.py index 924a483ddb..6e4db0ac06 100644 --- a/support/testing/tests/package/test_iptables.py +++ b/support/testing/tests/package/test_iptables.py @@ -11,6 +11,7 @@ class TestIptables(infra.basetest.BRTest): """ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_INIT_BUSYBOX=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y @@ -70,9 +71,26 @@ class TestIptables(infra.basetest.BRTest): _, exit_code = self.emulator.run(ping_test_cmd) self.assertNotEqual(exit_code, 0) + # Save the current rules to test the init script later. + self.assertRunOk("/etc/init.d/S35iptables save") + # We delete our only rule #1 in the INPUT chain. self.assertRunOk("iptables --delete INPUT 1") # Since we deleted the rule, the ping test command which was # supposed to fail earlier is now supposed to succeed. self.assertRunOk(ping_test_cmd) + + # Load the rules as saved before. + self.assertRunOk("/etc/init.d/S35iptables start") + + # Ping to 127.0.0.2 is expected to fail again. + _, exit_code = self.emulator.run(ping_test_cmd) + self.assertNotEqual(exit_code, 0) + + # And flush the rules again. + self.assertRunOk("/etc/init.d/S35iptables stop") + + # Since we deleted the rule, the ping test command which was + # supposed to fail earlier is now supposed to succeed. + self.assertRunOk(ping_test_cmd) From ec2735686a24bb6806a028bc2177000e389cd782 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 17 Feb 2025 16:31:27 +0100 Subject: [PATCH 07/88] support/testing: fix MyPy warnings about BRConfigTest This removes warnings in editors/IDEs with MyPy typechecking integration. Test classes override "config" with strings (different type than None). Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- support/testing/infra/basetest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 1ae6232da8..4f020e8a93 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -24,8 +24,8 @@ MINIMAL_CONFIG = \ class BRConfigTest(unittest.TestCase): """Test up to the configure stage.""" - config = None - br2_external = list() + config: str + br2_external: list[str] = list() downloaddir = None outputdir = None logtofile = True From 35b50e9b03377e9400d750bd0489bc980c495eba Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Fri, 28 Feb 2025 09:46:43 +0300 Subject: [PATCH 08/88] package/osm2pgsql: bump version to 2.0.1 Release-notes: https://github.com/osm2pgsql-dev/osm2pgsql/releases/tag/2.0.1 Change URL to osm2pgsql-dev. Signed-off-by: Maxim Kochetkov Signed-off-by: Julien Olivain --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index cc0d91f98f..9f119d9c7d 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 05c2355b4a59d03a0f9855b4234a3bdc717b078faee625e73357947d1a82fe89 osm2pgsql-2.0.0.tar.gz +sha256 b9d5c95ccc928aafc3c6caccb8b5bc19c4d48a5d1640cada07388d0dbf171ecc osm2pgsql-2.0.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 7b54e4c0d2..f968a159d2 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,8 +4,8 @@ # ################################################################################ -OSM2PGSQL_VERSION = 2.0.0 -OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) +OSM2PGSQL_VERSION = 2.0.1 +OSM2PGSQL_SITE = $(call github,osm2pgsql-dev,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO From dcae760d1147e865b7a7073aa7e1190c3e43f4da Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Feb 2025 19:55:38 +0100 Subject: [PATCH 09/88] package/libcec: bump version to 7.0.0 Release notes: https://github.com/Pulse-Eight/libcec/releases/tag/libcec-7.0.0 Removed patch which is included in this release. License file was renamed upstream: https://github.com/Pulse-Eight/libcec/commit/da640961528178e82a447038446db4afe31a899e Signed-off-by: Bernd Kuhls [Julien: update .checkpackageignore to fix check-package error] Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - .../0001-cecloader-h-fix-null-return.patch | 37 ------------------- package/libcec/libcec.hash | 4 +- package/libcec/libcec.mk | 4 +- 4 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 package/libcec/0001-cecloader-h-fix-null-return.patch diff --git a/.checkpackageignore b/.checkpackageignore index e97d2ebdf9..08285eadcc 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -620,7 +620,6 @@ package/libavl/0001-fix-makefile.patch lib_patch.Upstream package/libb64/0001-Integer-overflows.patch lib_patch.Upstream package/libb64/0002-Initialize-C++-objects.patch lib_patch.Upstream package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch lib_patch.Upstream -package/libcec/0001-cecloader-h-fix-null-return.patch lib_patch.Upstream package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch lib_patch.Upstream package/libcgicc/0001-disable-documentation-option.patch lib_patch.Sob lib_patch.Upstream package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch lib_patch.Upstream diff --git a/package/libcec/0001-cecloader-h-fix-null-return.patch b/package/libcec/0001-cecloader-h-fix-null-return.patch deleted file mode 100644 index 424e41c0ae..0000000000 --- a/package/libcec/0001-cecloader-h-fix-null-return.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 452b2049b2ee3e73968c603e5524b2d349ac0c3e Mon Sep 17 00:00:00 2001 -From: psykose -Date: Sat, 9 Apr 2022 17:59:11 +0000 -Subject: [PATCH] cecloader.h: fix null return - -returning NULL is invalid for a return type of bool when NULL is defined -as `nullptr` instead of 0L - -[Retrieved from: -https://github.com/Pulse-Eight/libcec/pull/599/commits/452b2049b2ee3e73968c603e5524b2d349ac0c3e] -Signed-off-by: Fabrice Fontaine ---- - include/cecloader.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/cecloader.h b/include/cecloader.h -index be76468f..550f598e 100644 ---- a/include/cecloader.h -+++ b/include/cecloader.h -@@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL) - if (!g_libCEC) - { - std::cout << dlerror() << std::endl; -- return NULL; -+ return false; - } - } - -@@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL) - if (!LibCecBootloader) - { - std::cout << "cannot find CECStartBootloader" << std::endl; -- return NULL; -+ return false; - } - - bool bReturn = LibCecBootloader(); diff --git a/package/libcec/libcec.hash b/package/libcec/libcec.hash index 3e5a443057..b019f53a5f 100644 --- a/package/libcec/libcec.hash +++ b/package/libcec/libcec.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 libcec-6.0.2.tar.gz -sha256 0137261d24ce001fc5237aacddd267533e0f150ac23cf21acffea599f7358f7a COPYING +sha256 7f9e57ae9fad37649adb6749b8f1310a71ccf3e92ae8b2d1cc9e8ae2d1da83f8 libcec-7.0.0.tar.gz +sha256 0137261d24ce001fc5237aacddd267533e0f150ac23cf21acffea599f7358f7a LICENSE.md diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 33e0463eb8..a45f074c30 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBCEC_VERSION = 6.0.2 +LIBCEC_VERSION = 7.0.0 LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPL-2.0+ -LIBCEC_LICENSE_FILES = COPYING +LIBCEC_LICENSE_FILES = LICENSE.md LIBCEC_INSTALL_STAGING = YES LIBCEC_DEPENDENCIES = host-pkgconf libplatform From 1539003393839048756f2cc05fc4a4cef75088a2 Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Thu, 27 Feb 2025 17:01:03 +0000 Subject: [PATCH 10/88] package/slirp4netns: bump to version 1.3.2 Changelog: [1]. [1]: https://github.com/rootless-containers/slirp4netns/releases/tag/v1.3.2 Signed-off-by: Raphael Pavlidis Signed-off-by: Julien Olivain --- package/slirp4netns/slirp4netns.hash | 2 +- package/slirp4netns/slirp4netns.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/slirp4netns/slirp4netns.hash b/package/slirp4netns/slirp4netns.hash index 1a6a657066..1751566185 100644 --- a/package/slirp4netns/slirp4netns.hash +++ b/package/slirp4netns/slirp4netns.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a3b7c7b593b279c46d25a48b583371ab762968e98b6a46457d8d52a755852eb9 slirp4netns-1.3.1.tar.gz +sha256 c98ef2679c7b8c96eed95409138a22904a0550494d191385637e953534d15c75 slirp4netns-1.3.2.tar.gz sha256 58db3cfabf8ec806bc060e54ab5466a31de4a3ae80fe4a8aa02fb6b1c053c93f COPYING diff --git a/package/slirp4netns/slirp4netns.mk b/package/slirp4netns/slirp4netns.mk index ce8ea34f2e..ffcd334ab6 100644 --- a/package/slirp4netns/slirp4netns.mk +++ b/package/slirp4netns/slirp4netns.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLIRP4NETNS_VERSION = 1.3.1 +SLIRP4NETNS_VERSION = 1.3.2 SLIRP4NETNS_SITE = $(call github,rootless-containers,slirp4netns,v$(SLIRP4NETNS_VERSION)) SLIRP4NETNS_LICENSE = GPL-2.0 SLIRP4NETNS_LICENSE_FILES = COPYING From 02e41b516ccb4ffe71e83996507c4e0f0bd070b5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 05:00:02 -0700 Subject: [PATCH 11/88] package/python-aiohttp: bump to version 3.11.12 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-aiohttp/python-aiohttp.hash | 4 ++-- package/python-aiohttp/python-aiohttp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index 0aa22e9fa3..a99e21d14c 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 17f04b60068122e998a60a3010679501 aiohttp-3.11.11.tar.gz -sha256 bb49c7f1e6ebf3821a42d81d494f538107610c3a705987f53068546b0e90303e aiohttp-3.11.11.tar.gz +md5 efe78467dfb0b559cb4725554b1fb53a aiohttp-3.11.12.tar.gz +sha256 7603ca26d75b1b86160ce1bbe2787a0b706e592af5b2504e12caa88a217767b0 aiohttp-3.11.12.tar.gz # Locally computed sha256 checksums sha256 9f80d0db7d755a941db4572172c270ecbd8f082ba215ddd095985942ed94a9eb LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 19e62745e0..5e436321b9 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.11.11 +PYTHON_AIOHTTP_VERSION = 3.11.12 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/fe/ed/f26db39d29cd3cb2f5a3374304c713fe5ab5a0e4c8ee25a0c45cc6adf844 +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/37/4b/952d49c73084fb790cb5c6ead50848c8e96b4980ad806cf4d2ad341eaa03 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt From e4469759c1c6b107c303b97a38903896d9466c6c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:52:06 -0700 Subject: [PATCH 12/88] package/python-aiosqlite: bump to version 0.21.0 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-aiosqlite/python-aiosqlite.hash | 4 ++-- package/python-aiosqlite/python-aiosqlite.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash index 52c78a7630..eed222f80f 100644 --- a/package/python-aiosqlite/python-aiosqlite.hash +++ b/package/python-aiosqlite/python-aiosqlite.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosqlite/json -md5 22620fe09bc9d9df3bffef19919eed7f aiosqlite-0.20.0.tar.gz -sha256 6d35c8c256637f4672f843c31021464090805bf925385ac39473fb16eaaca3d7 aiosqlite-0.20.0.tar.gz +md5 693b491a6ad7caa281618a83bf83ddc6 aiosqlite-0.21.0.tar.gz +sha256 131bb8056daa3bc875608c631c678cda73922a2d4ba8aec373b19f18c17e7aa3 aiosqlite-0.21.0.tar.gz # Locally computed sha256 checksums sha256 ab0c171dc3ef8bf325a84bb77d855421f2611335ddf6e08816b2922c4edc0f76 LICENSE diff --git a/package/python-aiosqlite/python-aiosqlite.mk b/package/python-aiosqlite/python-aiosqlite.mk index a48d676c69..bdb222001e 100644 --- a/package/python-aiosqlite/python-aiosqlite.mk +++ b/package/python-aiosqlite/python-aiosqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOSQLITE_VERSION = 0.20.0 +PYTHON_AIOSQLITE_VERSION = 0.21.0 PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz -PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/0d/3a/22ff5415bf4d296c1e92b07fd746ad42c96781f13295a074d58e77747848 +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/13/7d/8bca2bf9a247c2c5dfeec1d7a5f40db6518f88d314b8bca9da29670d2671 PYTHON_AIOSQLITE_SETUP_TYPE = flit PYTHON_AIOSQLITE_LICENSE = MIT PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE From e0af35c76a11f9edfe1b793086bffaba0f4e033c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:48:53 -0700 Subject: [PATCH 13/88] package/python-cryptography: bump to version 44.0.1 For change log, see: https://cryptography.io/en/44.0.1/changelog/ Signed-off-by: James Hilliard [Julien: add link to change log] Signed-off-by: Julien Olivain --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index aa7e16a043..909b702d16 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 09a765af8da172785de52631fe6c626508fdc8e451b7fb01d52f58b7841a813b python-cryptography-44.0.0-cargo2.tar.gz +sha256 85cb9d02cf5237881d0b62abab086acd1149d972f6f8c5aece4f8e10a37c944c python-cryptography-44.0.1-cargo2.tar.gz # Locally computed sha256 checksums sha256 3e0c7c091a948b82533ba98fd7cbb40432d6f1a9acbf85f5922d2f99a93ae6bb LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 9ae1fdbd83..fd2c3d7a50 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 44.0.0 +PYTHON_CRYPTOGRAPHY_VERSION = 44.0.1 PYTHON_CRYPTOGRAPHY_SOURCE_PYPI = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE_PYPI = https://files.pythonhosted.org/packages/91/4c/45dfa6829acffa344e3967d6006ee4ae8be57af746ae2eba1c431949b32c +PYTHON_CRYPTOGRAPHY_SITE_PYPI = https://files.pythonhosted.org/packages/c7/67/545c79fe50f7af51dbad56d16b23fe33f63ee6a5d956b3cb68ea110cbe64 PYTHON_CRYPTOGRAPHY_SITE = $(PYTHON_CRYPTOGRAPHY_SITE_PYPI)/$(PYTHON_CRYPTOGRAPHY_SOURCE_PYPI)?buildroot-path=filename PYTHON_CRYPTOGRAPHY_SETUP_TYPE = maturin PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause From 2c9d00e927b337d82db13776b23aef7e2b9a30ea Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:43:08 -0700 Subject: [PATCH 14/88] package/python-fastapi: bump to version 0.115.8 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index ec6e6ecd97..a241937ce5 100644 --- a/package/python-fastapi/python-fastapi.hash +++ b/package/python-fastapi/python-fastapi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fastapi/json -md5 294d889a46608f0a7d614f463aa3d2ce fastapi-0.115.7.tar.gz -sha256 0f106da6c01d88a6786b3248fb4d7a940d071f6f488488898ad5d354b25ed015 fastapi-0.115.7.tar.gz +md5 38428aff025530f61cd5b10efd764229 fastapi-0.115.8.tar.gz +sha256 0ce9111231720190473e222cdf0f07f7206ad7e53ea02beb1d2dc36e2f0741e9 fastapi-0.115.8.tar.gz # Locally computed sha256 checksums sha256 4ec89ffc81485b97fec584b2d4a961032eeffe834453894fd9c1274906cc744e LICENSE diff --git a/package/python-fastapi/python-fastapi.mk b/package/python-fastapi/python-fastapi.mk index 43bc9b3a50..08fe5623cb 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.115.7 +PYTHON_FASTAPI_VERSION = 0.115.8 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/a2/f5/3f921e59f189e513adb9aef826e2841672d50a399fead4e69afdeb808ff4 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/a2/b2/5a5dc4affdb6661dea100324e19a7721d5dc524b464fe8e366c093fd7d87 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE From 9c9a07668a1f94522d76e117bb8b7ed1113ecaf7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:40:18 -0700 Subject: [PATCH 15/88] package/python-maturin: bump to version 1.8.2 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index 1b295127f6..34e0f1da32 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 da4ab5a84c35d0ab00c0fb63975f25c497d6570dcdeaae0ec0f7d9f70f1d5382 python-maturin-1.8.1-cargo2.tar.gz +sha256 0e8fdcd6cf3f4f7e018a624e35b731d00971b09a71515e6108df43407cd684eb python-maturin-1.8.2-cargo2.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index b9816e2119..6a99bbf376 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 1.8.1 +PYTHON_MATURIN_VERSION = 1.8.2 PYTHON_MATURIN_SOURCE_PYPI = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE_PYPI = https://files.pythonhosted.org/packages/9a/08/ccb0f917722a35ab0d758be9bb5edaf645c3a3d6170061f10d396ecd273f +PYTHON_MATURIN_SITE_PYPI = https://files.pythonhosted.org/packages/e0/8f/6978427ce3f72b189012e1731d1d2d27b3151caa741666c905320e0a3662 PYTHON_MATURIN_SITE = $(PYTHON_MATURIN_SITE_PYPI)/$(PYTHON_MATURIN_SOURCE_PYPI)?buildroot-path=filename PYTHON_MATURIN_SETUP_TYPE = setuptools-rust PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT From 0df577df87d61090a2bf4228e35a4b44a1fe1ded Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:30:40 -0700 Subject: [PATCH 16/88] package/python-pydantic-core: bump to version 2.29.0 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-pydantic-core/python-pydantic-core.hash | 2 +- package/python-pydantic-core/python-pydantic-core.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index d908d5cddc..d310e8ae02 100644 --- a/package/python-pydantic-core/python-pydantic-core.hash +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 d7e62e6331eb4e712b83dad434926440c7c94989e20d693cfae119b8777ce777 python-pydantic-core-2.27.2-cargo2.tar.gz +sha256 94ebefcb84127e3a950129dc2485e046ece91d3a7f0959c6de124eca5573389d python-pydantic-core-2.29.0-cargo2.tar.gz # Locally computed sha256 checksums sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk index 6a18421eee..c27967689d 100644 --- a/package/python-pydantic-core/python-pydantic-core.mk +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_CORE_VERSION = 2.27.2 +PYTHON_PYDANTIC_CORE_VERSION = 2.29.0 PYTHON_PYDANTIC_CORE_SOURCE_PYPI = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz -PYTHON_PYDANTIC_CORE_SITE_PYPI = https://files.pythonhosted.org/packages/fc/01/f3e5ac5e7c25833db5eb555f7b7ab24cd6f8c322d3a3ad2d67a952dc0abc +PYTHON_PYDANTIC_CORE_SITE_PYPI = https://files.pythonhosted.org/packages/79/f6/904edea98c98c09b8d618d619749af19a50ea5a71b9199ee2131a5a03dfb PYTHON_PYDANTIC_CORE_SITE = $(PYTHON_PYDANTIC_CORE_SITE_PYPI)/$(PYTHON_PYDANTIC_CORE_SOURCE_PYPI)?buildroot-path=filename PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT From 50aeed6b2323aed3f76f8a7dee6215955a3c45fd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:23:35 -0700 Subject: [PATCH 17/88] package/python-sentry-sdk: bump to version 2.21.0 License hash changed due to date range removal: https://github.com/getsentry/sentry-python/commit/7473afb77d7f0ba534bf5fdcd22622b06a5f7e62 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-sentry-sdk/python-sentry-sdk.hash | 6 +++--- package/python-sentry-sdk/python-sentry-sdk.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 0bf0392c77..b1b816fa51 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 1ee9b58ddcc2227b8534c7ab9c5b8da7 sentry_sdk-2.20.0.tar.gz -sha256 afa82713a92facf847df3c6f63cec71eb488d826a50965def3d7722aa6f0fdab sentry_sdk-2.20.0.tar.gz +md5 a24d71a651889b89c12983c6bd3d1abf sentry_sdk-2.21.0.tar.gz +sha256 a6d38e0fb35edda191acf80b188ec713c863aaa5ad8d5798decb8671d02077b6 sentry_sdk-2.21.0.tar.gz # Locally computed sha256 checksums -sha256 6d7ec62dc20e8b92cb88b89fb3b55ee8576505f3e1afa57952548f6eea5d008e LICENSE +sha256 2a140d660f462812fa290bc740d04633126c5ec45d84b79b569e127b0eeddd0b LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index a404bcda15..25b419f1e2 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 2.20.0 +PYTHON_SENTRY_SDK_VERSION = 2.21.0 PYTHON_SENTRY_SDK_SOURCE = sentry_sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/68/e8/6a366c0cd5e129dda6ecb20ff097f70b18182c248d4c27e813c21f98992a +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/08/63/3f0e88709cf4af992e2813c27d8ba628a891db0805e3fcc6dc834e142c5b PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = MIT PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From fe43cf9c9522d992cf2d5b57442297bb8567f659 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:20:11 -0700 Subject: [PATCH 18/88] package/python-weasyprint: bump to version 64.0 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 0d39d55aae..9c51ad95a3 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 219b0f3ea8247e97f16477d509ee0f40 weasyprint-63.1.tar.gz -sha256 cb424e63e8dd3f14195bfe5f203527646aa40a2f00ac819f9d39b8304cec0044 weasyprint-63.1.tar.gz +md5 9e87ec00619aad446c51f679117be676 weasyprint-64.0.tar.gz +sha256 1ceb3ea6306db4a3d06df0eafae3a5a6e879c35c40091aa8ceb5bcb143e80b29 weasyprint-64.0.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index 583af799b1..7edb9f28da 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 63.1 +PYTHON_WEASYPRINT_VERSION = 64.0 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/2b/f0/1ac7d241b8cabaaf047278ef67b64869473a4e0a2218a1cbc0a6ffb0d8fd +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/e3/04/c73f99531bce81d4ced5cd18a159855de261f83843a5633acd67ae327933 PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE From 7c9ac213d4a5f8ce89a00b461d16e78e5652a54a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:17:44 -0700 Subject: [PATCH 19/88] package/python-websockets: bump to version 15.0 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-websockets/python-websockets.hash | 4 ++-- package/python-websockets/python-websockets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index 3e762c5029..3279977431 100644 --- a/package/python-websockets/python-websockets.hash +++ b/package/python-websockets/python-websockets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websockets/json -md5 26d1dc6e53395f537667d66ba1832ea7 websockets-14.2.tar.gz -sha256 5059ed9c54945efb321f097084b4c7e52c246f2c869815876a69d1efc4ad6eb5 websockets-14.2.tar.gz +md5 753a523e3de5b0f32927e590b910dfde websockets-15.0.tar.gz +sha256 ca36151289a15b39d8d683fd8b7abbe26fc50be311066c5f8dcf3cb8cee107ab websockets-15.0.tar.gz # Locally computed sha256 checksums sha256 3d6a0c050d8bec52fabad502e45fb25bd02bcadbd70dea34d447b6a0ff4e6da8 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index 2de0b32d58..a39c7580ef 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 14.2 +PYTHON_WEBSOCKETS_VERSION = 15.0 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/94/54/8359678c726243d19fae38ca14a334e740782336c9f19700858c4eb64a1e +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/2e/7a/8bc4d15af7ff30f7ba34f9a172063bfcee9f5001d7cef04bee800a658f33 PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE From dfd217cdf2360a1241a424e88d532b6e87eb925e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 17 Feb 2025 04:13:30 -0700 Subject: [PATCH 20/88] package/python-pymodbus: bump to version 3.8.6 Signed-off-by: James Hilliard Signed-off-by: Julien Olivain --- package/python-pymodbus/python-pymodbus.hash | 4 ++-- package/python-pymodbus/python-pymodbus.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index 8be892f221..38d921229b 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymodbus/json -md5 60f37920f3fe9c178dad2d618d4c7794 pymodbus-3.8.3.tar.gz -sha256 d886186bf7c3cc140f17e830919c23e4cc88334fbb91d6e5e1d7dd05860fe2c8 pymodbus-3.8.3.tar.gz +md5 af760b61450c670a280c098e3484635d pymodbus-3.8.6.tar.gz +sha256 7689b56cc3ad05a594e1486e772abb9d9646c01737935df492db04455680baf6 pymodbus-3.8.6.tar.gz # Locally computed sha256 checksums sha256 47f904249172e795a6b32de91f471073297befffd74e17cafc288d348a55972e LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index e21c5c6a90..ff5a8eb725 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.8.3 +PYTHON_PYMODBUS_VERSION = 3.8.6 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/f7/c7/95ad9774e7ba8547f52d657b09fee7fa02d87532866f561c6d2bb9068b8c +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/47/3a/a6958507d6f9c0c50f11cd299b056161c10f3cef7c227b44bc183a7e7854 PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE From c5c772ef8036c530763c1c00ac54c97f3e89b0ab Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 5 Feb 2025 21:33:54 +0100 Subject: [PATCH 21/88] package/rtl8192eu: bump to 2025-02-03 version This version allows to build with Linux 6.14. Signed-off-by: Giulio Benetti [Julien: add back new line in hash file to fix check-package error] Signed-off-by: Julien Olivain --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 250cd556b1..de2c55cf4c 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 dbd565edc8d52a1429d8551795fb4da3ca44cf27867466010e0e6d00c86aef5c rtl8192eu-6755ce9c15bbcb5dcffbca7f6f08e661ccdaacdb.tar.gz +sha256 b5568e5a48e99839ec76359e11da29705e80cbfcae210c68eaea4bf433760f6d rtl8192eu-c56c37f7ce8b8f1fd17c9719a9ea668dc1e45965.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index 9cd88060ce..de54f03bc9 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 6755ce9c15bbcb5dcffbca7f6f08e661ccdaacdb +RTL8192EU_VERSION = c56c37f7ce8b8f1fd17c9719a9ea668dc1e45965 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From 44355f79980562177228c5f010683fa4cffe47b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:51 +0100 Subject: [PATCH 22/88] package/freescale-imx/imx-gpu-g2d: install the specific library for i.MX8MM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the i.MX8MM, this package contains a specific library that is not linked to OpenCL because there is no openCL support on i.MX8MM GPU. Signed-off-by: Sébastien Szymanski Signed-off-by: Julien Olivain --- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 0a7ee3c298..213f20a7d9 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -22,12 +22,14 @@ define IMX_GPU_G2D_EXTRACT_CMDS $(call NXP_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE)) endef +IMX_GPU_G2D_SUBDIR = $(if $(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),mx8mm,) + define IMX_GPU_G2D_INSTALL_STAGING_CMDS - cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr + cp -a $(@D)/g2d/usr/lib/$(IMX_GPU_G2D_SUBDIR)/libg2d* $(STAGING_DIR)/usr/lib/ endef define IMX_GPU_G2D_INSTALL_TARGET_CMDS - cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr + cp -a $(@D)/g2d/usr/lib/$(IMX_GPU_G2D_SUBDIR)/libg2d* $(TARGET_DIR)/usr/lib/ endef $(eval $(generic-package)) From f34a7a13af0afc2d977439dccf6e0e4240e95044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:52 +0100 Subject: [PATCH 23/88] package/freescale-imx/firmware-ele-imx: bump to version 1.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v49 September 2023" to "v57 July 2024". Add SCR.txt file to _LICENSE_FILES. Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- .../freescale-imx/firmware-ele-imx/firmware-ele-imx.hash | 7 ++++--- package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash index 0923e546b0..6182dc57be 100644 --- a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash @@ -1,4 +1,5 @@ # Locally calculated -sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 8791109824767346237e53ac2c712824e54608e2092859161e6bb3e5385a7595 firmware-ele-imx-1.3.0-17945fc.bin +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 8721a617a5d4c7f366aaf857ebda21eb4c9fc9175dc92b70f627c611d403ec8e SCR.txt diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk index d493fe4a96..4225805d50 100644 --- a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk @@ -4,12 +4,13 @@ # ################################################################################ -FIRMWARE_ELE_IMX_VERSION = 0.1.0 +FIRMWARE_ELE_IMX_VERSION = 1.3.0 +FIRMWARE_ELE_IMX_REVISION = 17945fc FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) -FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION)-$(FIRMWARE_ELE_IMX_REVISION).bin FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement -FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING EULA +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING EULA SCR.txt FIRMWARE_ELE_IMX_REDISTRIBUTE = NO FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES From 9d4dcf5b0cff580ce3a96ceb58c9085fac18d92b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:53 +0100 Subject: [PATCH 24/88] package/freescale-imx/imx-codec: bump to version 4.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v49 September 2023" to "v56 April 2024". Add SCR-imx-codec.txt to _LICENSE_FILES. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- package/freescale-imx/imx-codec/imx-codec.hash | 7 ++++--- package/freescale-imx/imx-codec/imx-codec.mk | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/freescale-imx/imx-codec/imx-codec.hash b/package/freescale-imx/imx-codec/imx-codec.hash index 666d38d001..18a2cebec9 100644 --- a/package/freescale-imx/imx-codec/imx-codec.hash +++ b/package/freescale-imx/imx-codec/imx-codec.hash @@ -1,4 +1,5 @@ # locally computed -sha256 b0744a91c265202a79a019c72f17cae01fd5b63a3ba451592b6c8349d95719e0 imx-codec-4.8.2.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 1a41a3cad9e0f4baa904fcec896105d3474e18d13f169dad1172d5691fc11c9a imx-codec-4.9.0.bin +sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 5832c59215fcc5ffd2566c0bb35c7e5c8181ca609f529962c2bd0606f3f12aa3 SCR-imx-codec.txt diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk index 54ba6f126e..0cfe74df0b 100644 --- a/package/freescale-imx/imx-codec/imx-codec.mk +++ b/package/freescale-imx/imx-codec/imx-codec.mk @@ -4,13 +4,13 @@ # ################################################################################ -IMX_CODEC_VERSION = 4.8.2 +IMX_CODEC_VERSION = 4.9.0 IMX_CODEC_SITE = $(FREESCALE_IMX_SITE) IMX_CODEC_SOURCE = imx-codec-$(IMX_CODEC_VERSION).bin IMX_CODEC_INSTALL_STAGING = YES IMX_CODEC_LICENSE = NXP Semiconductor Software License Agreement, BSD-3-Clause (flac, ogg headers) -IMX_CODEC_LICENSE_FILES = EULA COPYING +IMX_CODEC_LICENSE_FILES = EULA COPYING SCR-imx-codec.txt IMX_CODEC_REDISTRIBUTE = NO ifeq ($(BR2_aarch64),y) From 6295c5ef567d8500d6a8d1ee9e29396d39fa4a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:54 +0100 Subject: [PATCH 25/88] package/freescale-imx/firmware-imx: bump version to 8.26 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v56 April 2024" to "v57 July 2024". Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- package/freescale-imx/firmware-imx/firmware-imx.hash | 6 +++--- package/freescale-imx/firmware-imx/firmware-imx.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index d606ae6da6..606075c85e 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2e27962332197ebebbb30138f6dfb365361d48d7efa565df97c4f79285b1ca50 firmware-imx-8.24-fbe0a4c.bin -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 b2fcf84a0417678aa441b1bcde9ece467f8bd063a63d8390684f8e37768d84cf firmware-imx-8.26-d4c33ab.bin +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA sha256 40d02f6d6b4e94d9307529408f372f5a9908cf3d156ec533a4e54274b40f271e SCR.txt diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 8666d76a73..62077238a7 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,8 +4,8 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.24 -FIRMWARE_IMX_REVISION = fbe0a4c +FIRMWARE_IMX_VERSION = 8.26 +FIRMWARE_IMX_REVISION = d4c33ab FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION)-$(FIRMWARE_IMX_REVISION).bin From f3350d1af2cfca8f48756843e964168b5bb7718e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:55 +0100 Subject: [PATCH 26/88] package/freescale-imx/imx-vpu-hantro: bump version to 1.35.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v49 September 2023" to "v57 July 2024". Add SCR-imx-vpu-hantro.txt to _LICENSE_FILES. Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log and SoB email] Signed-off-by: Julien Olivain --- package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash | 7 ++++--- package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash index 069700fc5f..f103970893 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash @@ -1,4 +1,5 @@ # Locally computed: -sha256 21fb3288f6f44631ebf6479284c5c081ff829a3068811eebbacc510f14300ab4 imx-vpu-hantro-1.31.0.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 c4730cb996a3eafbc06ed0765cd509caa63cdeecdc0c4958efbc91383e0501fd imx-vpu-hantro-1.35.0-98ff183.bin +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 5d06ff9de56f0788f6b090c93226dd951764124635c687cef64f29776c2e8cf8 SCR-imx-vpu-hantro.txt diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk index 64df16e21b..256153892b 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,9 +4,10 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.31.0 +IMX_VPU_HANTRO_VERSION = 1.35.0 +IMX_VPU_HANTRO_REVISION = 98ff183 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) -IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin +IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION)-$(IMX_VPU_HANTRO_REVISION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux IMX_VPU_HANTRO_INSTALL_STAGING = YES @@ -19,7 +20,7 @@ IMX_VPU_HANTRO_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) IMX_VPU_HANTRO_LICENSE = NXP Semiconductor Software License Agreement -IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING +IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING SCR-imx-vpu-hantro.txt IMX_VPU_HANTRO_REDISTRIBUTE = NO define IMX_VPU_HANTRO_EXTRACT_CMDS From fe08ec9efa6ec9a2506f7e3ffcb83c14b96b55ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:56 +0100 Subject: [PATCH 27/88] package/freescale-imx/imx-vpu-hantro-vc: bump version to 1.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v48 July 2023" to "v57 July 2024". Add SCR-imx-vpu-hantro.txt to _LICENSE_FILES. Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- .../freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash | 7 ++++--- .../freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash index 7f6193e397..1b1447c34e 100644 --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash @@ -1,4 +1,5 @@ # Locally computed: -sha256 84fcefa0619def2f009ca6651c5cffcda57fed29cd7060ef68be48c5d0d7814b imx-vpu-hantro-vc-1.9.1.bin -sha256 de37a0bcbf1717b910c1a53ea6eab853c404e61e8143bb6c081d39f532571e54 COPYING -sha256 b158adaac5e2d1c7fa6e739ff168ab498957e3303070f1c0b0e66d9a8f02a354 EULA +sha256 713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df imx-vpu-hantro-vc-1.10.1-c0244a1.bin +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 a6f0297ad8ab4906229957c2c7c4bf825d543d99ffb5bdafc2de5a8d884eb88b SCR.txt diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk index de88ebf32c..b28e61bd8a 100644 --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk @@ -4,14 +4,15 @@ # ################################################################################ -IMX_VPU_HANTRO_VC_VERSION = 1.9.1 +IMX_VPU_HANTRO_VC_VERSION = 1.10.1 +IMX_VPU_HANTRO_VC_REVISION = c0244a1 IMX_VPU_HANTRO_VC_SITE = $(FREESCALE_IMX_SITE) -IMX_VPU_HANTRO_VC_SOURCE = imx-vpu-hantro-vc-$(IMX_VPU_HANTRO_VC_VERSION).bin +IMX_VPU_HANTRO_VC_SOURCE = imx-vpu-hantro-vc-$(IMX_VPU_HANTRO_VC_VERSION)-$(IMX_VPU_HANTRO_VC_REVISION).bin IMX_VPU_HANTRO_VC_DEPENDENCIES = linux IMX_VPU_HANTRO_VC_INSTALL_STAGING = YES IMX_VPU_HANTRO_VC_LICENSE = NXP Semiconductor Software License Agreement -IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING +IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING SCR.txt IMX_VPU_HANTRO_VC_REDISTRIBUTE = NO define IMX_VPU_HANTRO_VC_EXTRACT_CMDS From 793b45cea77ed645f6800240811d03f8be392ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:57 +0100 Subject: [PATCH 28/88] package/freescale-imx/imx-vpu-hantro-daemon: bump version to 1.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". Add SCR-imx-vpu-hantro-daemon.txt to _LICENSE_FILES. Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- .../imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash | 3 ++- .../imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash index 0fd64cdf9d..0f3ca60865 100644 --- a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 80d6620063fd5e5506b05c907677b579d471a9b6daa8b26ffb963110cc680bf9 imx-vpu-hantro-daemon-1.1.9.tar.gz +sha256 c3ac36c203fef44ef21c98a90b3fff73af9f328f16b4d85157308848f6c34823 imx-vpu-hantro-daemon-1.4.0-75d9dd9.tar.gz sha256 bb645f02b260955f333348100e40af76253e2cd8b116bac047230439dd53ec5a LICENSE.txt +sha256 c61176048f74950c0849d91b4b6b30e335e050462a8950b89a4e6f35c7fe577b SCR-imx-vpu-hantro-daemon.txt diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk index 12ec055f92..a328005328 100644 --- a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk @@ -4,10 +4,12 @@ # ################################################################################ -IMX_VPU_HANTRO_DAEMON_VERSION = 1.1.9 +IMX_VPU_HANTRO_DAEMON_VERSION = 1.4.0 +IMX_VPU_HANTRO_DAEMON_REVISION = 75d9dd9 +IMX_VPU_HANTRO_DAEMON_SOURCE = imx-vpu-hantro-daemon-$(IMX_VPU_HANTRO_DAEMON_VERSION)-$(IMX_VPU_HANTRO_DAEMON_REVISION).tar.gz IMX_VPU_HANTRO_DAEMON_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_DAEMON_LICENSE = NXP Semiconductor Software License Agreement -IMX_VPU_HANTRO_DAEMON_LICENSE_FILES = LICENSE.txt +IMX_VPU_HANTRO_DAEMON_LICENSE_FILES = LICENSE.txt SCR-imx-vpu-hantro-daemon.txt IMX_VPU_HANTRO_DAEMON_REDISTRIBUTE = NO IMX_VPU_HANTRO_DAEMON_DEPENDENCIES = imx-vpu-hantro linux ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP),y) From 0f0949cee02a8bc577bed151673d032f630ce405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:58 +0100 Subject: [PATCH 29/88] package/freescale-imx/imx-seco: bump version to 5.9.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v56 April 2024" to "v57 July 2024". Add SCR.txt and SCR-imx-seco.txt to _LICENSE_FILES. Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- package/freescale-imx/imx-seco/imx-seco.hash | 8 +++++--- package/freescale-imx/imx-seco/imx-seco.mk | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-seco/imx-seco.hash b/package/freescale-imx/imx-seco/imx-seco.hash index a91dbc2274..5c29ec4fa9 100644 --- a/package/freescale-imx/imx-seco/imx-seco.hash +++ b/package/freescale-imx/imx-seco/imx-seco.hash @@ -1,4 +1,6 @@ # Locally calculated -sha256 9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7 imx-seco-5.9.4.bin -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 bd8dc01966076836aabff53f2463295294166595006e1db430db21b6ffa6b667 imx-seco-5.9.4.1-0333596.bin +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 92d7a6594cece4d59f4da4677f3128aa4997fd49955aee50a6fed32e3800df76 SCR.txt +sha256 92d7a6594cece4d59f4da4677f3128aa4997fd49955aee50a6fed32e3800df76 SCR-imx-seco.txt diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index 4afac8005b..012f367099 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -4,12 +4,13 @@ # ################################################################################ -IMX_SECO_VERSION = 5.9.4 +IMX_SECO_VERSION = 5.9.4.1 +IMX_SECO_REVISION = 0333596 IMX_SECO_SITE = $(FREESCALE_IMX_SITE) -IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin +IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION)-$(IMX_SECO_REVISION).bin IMX_SECO_LICENSE = NXP Semiconductor Software License Agreement -IMX_SECO_LICENSE_FILES = EULA COPYING +IMX_SECO_LICENSE_FILES = EULA COPYING SCR.txt SCR-imx-seco.txt IMX_SECO_REDISTRIBUTE = NO define IMX_SECO_EXTRACT_CMDS From 8f2a6c9c469a8c840a74ee9fa9312692bd2428db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:40:59 +0100 Subject: [PATCH 30/88] package/freescale-imx/imx-sc-firmware: bump version to 1.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v56 April 2024" to "v57 July 2024". Add SCR.txt to _LICENSE_FILES. Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash | 7 ++++--- package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash index 955879eb43..9a12383e02 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash @@ -1,4 +1,5 @@ # Locally calculated -sha256 23327c38ffc746321697528b2c4c726ed5c3ebadf4b312592d533664719595bd imx-sc-firmware-1.16.0.bin -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 083e86cc26f2187863513677085474149960311e7ebca36df69306014daab948 imx-sc-firmware-1.17.0-83624b9.bin +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 bfbeef332d05c9608c790a12bbbf4c66a8acc76b159145ba7ef48d3799ca8a61 SCR.txt diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk index 5c9ec59d8a..1e6d6e7dd5 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -4,12 +4,13 @@ # ################################################################################ -IMX_SC_FIRMWARE_VERSION = 1.16.0 +IMX_SC_FIRMWARE_VERSION = 1.17.0 +IMX_SC_FIRMWARE_REVISION = 83624b9 IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) -IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin +IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION)-$(IMX_SC_FIRMWARE_REVISION).bin IMX_SC_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement -IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING +IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING SCR.txt IMX_SC_FIRMWARE_REDISTRIBUTE = NO define IMX_SC_FIRMWARE_EXTRACT_CMDS From 816f239e370d57a76ff388a52acbca28f84e8911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:41:00 +0100 Subject: [PATCH 31/88] package/freescale-imx/imx-gpu-g2d: bump version to 6.4.11.p2.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v56 April 2024" to "v57 July 2024". Add SCR.txt to _LICENSE_FILES. Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash | 9 +++++---- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 922fce2236..f040e00f68 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,6 @@ # Locally calculated -sha256 413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663 imx-gpu-g2d-6.4.11.p2.6-arm-bc7b6a2.bin -sha256 b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918 imx-gpu-g2d-6.4.11.p2.6-aarch64-bc7b6a2.bin -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 780479f19142126ed58e12222b80f8f3b882ad3d223ff61b7ea02001f517ff03 imx-gpu-g2d-6.4.11.p2.10-aarch64-accdd64.bin +sha256 cd4fd05dd6f6880edc3255c85fe08094a07ea4cd3eee947df004dcb8f37bc8fa imx-gpu-g2d-6.4.11.p2.10-arm-accdd64.bin +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 3f3b817ca9490fbe89a83395a0961122aca138bf43acd869c6ca086502a1e131 SCR-imx-gpu-g2d.txt diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 213f20a7d9..1154943b3a 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -4,18 +4,19 @@ # ################################################################################ +IMX_GPU_G2D_REVISION = accdd64 ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.11.p2.6-aarch64-bc7b6a2 +IMX_GPU_G2D_VERSION = 6.4.11.p2.10-aarch64 else -IMX_GPU_G2D_VERSION = 6.4.11.p2.6-arm-bc7b6a2 +IMX_GPU_G2D_VERSION = 6.4.11.p2.10-arm endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) -IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin +IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION)-$(IMX_GPU_G2D_REVISION).bin IMX_GPU_G2D_DEPENDENCIES = imx-gpu-viv IMX_GPU_G2D_INSTALL_STAGING = YES IMX_GPU_G2D_LICENSE = NXP Semiconductor Software License Agreement -IMX_GPU_G2D_LICENSE_FILES = EULA COPYING +IMX_GPU_G2D_LICENSE_FILES = EULA COPYING SCR-imx-gpu-g2d.txt IMX_GPU_G2D_REDISTRIBUTE = NO define IMX_GPU_G2D_EXTRACT_CMDS From ab1c1c7f4919794289fdeb338647f7ca8c547fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 5 Feb 2025 12:41:01 +0100 Subject: [PATCH 32/88] package/freescale-imx/imx-gpu-viv: bump version to 6.4.11.p2.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is aligned with NXP Linux BSP version "lf-6.6.52-2.2.0". License hashes changed because the LA_OPT_NXP_Software_License changed from "v56 April 2024" to "v57 July 2024". Add SCR.txt to _LICENSE_FILES. Note: in this release, the package source archive name changed to include a revision. This commit adds a new _REVISION variable with the value published in the corresponding NXP BSP. Signed-off-by: Sébastien Szymanski [Julien: fixed the bsp version name in commit log] Signed-off-by: Julien Olivain --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 9 +++++---- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index cce08e2727..87ac86ab7a 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,6 @@ # Locally calculated -sha256 cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3 imx-gpu-viv-6.4.11.p2.6-aarch32-bc7b6a2.bin -sha256 5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1 imx-gpu-viv-6.4.11.p2.6-aarch64-bc7b6a2.bin -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 2242c7cbf1a2b07d40eefe5d1507747e477c54912f179ee0585a5d7965074ce0 imx-gpu-viv-6.4.11.p2.10-aarch32-accdd64.bin +sha256 8108fd146de6986486f34860227511a5101b31072b99cd78ae38afba8939fd4e imx-gpu-viv-6.4.11.p2.10-aarch64-accdd64.bin +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 ab20fa3f527fce99087d8d3cd4e2cf4b9cfdfaaa98b3d766a2b5953a981323d3 SCR-imx-gpu-viv.txt diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index a559bb7478..857a11b3b9 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -4,18 +4,19 @@ # ################################################################################ +IMX_GPU_VIV_REVISION = accdd64 ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.11.p2.6-aarch64-bc7b6a2 +IMX_GPU_VIV_VERSION = 6.4.11.p2.10-aarch64 else -IMX_GPU_VIV_VERSION = 6.4.11.p2.6-aarch32-bc7b6a2 +IMX_GPU_VIV_VERSION = 6.4.11.p2.10-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) -IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin +IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION)-$(IMX_GPU_VIV_REVISION).bin IMX_GPU_VIV_INSTALL_STAGING = YES IMX_GPU_VIV_LICENSE = NXP Semiconductor Software License Agreement -IMX_GPU_VIV_LICENSE_FILES = EULA COPYING +IMX_GPU_VIV_LICENSE_FILES = EULA COPYING SCR-imx-gpu-viv.txt IMX_GPU_VIV_REDISTRIBUTE = NO IMX_GPU_VIV_PROVIDES = libegl libgles libopencl libopenvg From 69487c630be20949f1060df83996ae64ff5ce095 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:09 -0400 Subject: [PATCH 33/88] configs/freescale_imx93evk: bump BSP components to lf-6.6.52-2.2.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx93evk/patches/linux/linux.hash | 2 +- board/freescale/imx93evk/patches/uboot/uboot.hash | 2 +- configs/freescale_imx93evk_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..58100572e4 100644 --- a/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 2b5b4a370a55b790ca318e95e2c1aac9d9166ea549179ef9929c346863b4ea57 imx-atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx93evk/patches/linux/linux.hash +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx93evk/patches/uboot/uboot.hash b/board/freescale/imx93evk/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx93evk/patches/uboot/uboot.hash +++ b/board/freescale/imx93evk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig index b244ba9684..1472914270 100644 --- a/configs/freescale_imx93evk_defconfig +++ b/configs/freescale_imx93evk_defconfig @@ -8,7 +8,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-11x11-evk" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.52-2.2.0)/imx-atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx93_11x11_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From b4b29434a34648baa89c9c23e4c8caa004f3675d Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:10 -0400 Subject: [PATCH 34/88] configs/freescale_imx8qxpmek: bump BSP components to lf-6.6.52-2.2.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx8qxpmek/patches/linux/linux.hash | 2 +- board/freescale/imx8qxpmek/patches/uboot/uboot.hash | 2 +- configs/freescale_imx8qxpmek_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..58100572e4 100644 --- a/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 2b5b4a370a55b790ca318e95e2c1aac9d9166ea549179ef9929c346863b4ea57 imx-atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/linux/linux.hash b/board/freescale/imx8qxpmek/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx8qxpmek/patches/linux/linux.hash +++ b/board/freescale/imx8qxpmek/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/uboot/uboot.hash b/board/freescale/imx8qxpmek/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx8qxpmek/patches/uboot/uboot.hash +++ b/board/freescale/imx8qxpmek/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 3ff476e992..9dbc4be81b 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.52-2.2.0)/imx-atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From ebc64d71935bc6ead7b8f374f27aeca68b1e94f9 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:11 -0400 Subject: [PATCH 35/88] configs/freescale_imx8qmmek: bump BSP components to lf-6.6.52-2.2.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx8qmmek/patches/linux/linux.hash | 2 +- board/freescale/imx8qmmek/patches/uboot/uboot.hash | 2 +- configs/freescale_imx8qmmek_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..58100572e4 100644 --- a/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 2b5b4a370a55b790ca318e95e2c1aac9d9166ea549179ef9929c346863b4ea57 imx-atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8qmmek/patches/linux/linux.hash b/board/freescale/imx8qmmek/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx8qmmek/patches/linux/linux.hash +++ b/board/freescale/imx8qmmek/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8qmmek/patches/uboot/uboot.hash b/board/freescale/imx8qmmek/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx8qmmek/patches/uboot/uboot.hash +++ b/board/freescale/imx8qmmek/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index 6fb3a54df1..5b9c07b1f6 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.52-2.2.0)/imx-atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 8de20f0873d4dd36034e148df22e06a4eb82fbb7 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:12 -0400 Subject: [PATCH 36/88] configs/freescale_imx8mqevk: bump BSP components to lf-6.6.52-2.2.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx8mqevk/patches/linux/linux.hash | 2 +- board/freescale/imx8mqevk/patches/uboot/uboot.hash | 2 +- configs/freescale_imx8mqevk_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..58100572e4 100644 --- a/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 2b5b4a370a55b790ca318e95e2c1aac9d9166ea549179ef9929c346863b4ea57 imx-atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8mqevk/patches/linux/linux.hash b/board/freescale/imx8mqevk/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx8mqevk/patches/linux/linux.hash +++ b/board/freescale/imx8mqevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8mqevk/patches/uboot/uboot.hash b/board/freescale/imx8mqevk/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx8mqevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8mqevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 4d8a3f1ea2..ddba356650 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -21,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.52-2.2.0)/imx-atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From cb0e3a8520c0e7f293a01d63b272577fa6c96f1a Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:13 -0400 Subject: [PATCH 37/88] configs/freescale_imx8mpevk: bump BSP components to lf-6.6.52-2.2.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx8mpevk/patches/linux/linux.hash | 2 +- board/freescale/imx8mpevk/patches/uboot/uboot.hash | 2 +- configs/freescale_imx8mpevk_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..58100572e4 100644 --- a/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 2b5b4a370a55b790ca318e95e2c1aac9d9166ea549179ef9929c346863b4ea57 imx-atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8mpevk/patches/linux/linux.hash b/board/freescale/imx8mpevk/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx8mpevk/patches/linux/linux.hash +++ b/board/freescale/imx8mpevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8mpevk/patches/uboot/uboot.hash b/board/freescale/imx8mpevk/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx8mpevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8mpevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index cb9f896a7a..894b5a2faf 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk" @@ -21,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.52-2.2.0)/imx-atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imx8mpevk/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y From cd8dc24ac84513caf06fe3c1e12985d2bb3f8c7f Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:14 -0400 Subject: [PATCH 38/88] configs/freescale_imx8mnevk: bump BSP components to lf-6.6.52-2.2.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx8mnevk/patches/linux/linux.hash | 2 +- board/freescale/imx8mnevk/patches/uboot/uboot.hash | 2 +- configs/freescale_imx8mnevk_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..58100572e4 100644 --- a/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 2b5b4a370a55b790ca318e95e2c1aac9d9166ea549179ef9929c346863b4ea57 imx-atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8mnevk/patches/linux/linux.hash b/board/freescale/imx8mnevk/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx8mnevk/patches/linux/linux.hash +++ b/board/freescale/imx8mnevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8mnevk/patches/uboot/uboot.hash b/board/freescale/imx8mnevk/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx8mnevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8mnevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index fc601dd5fb..83a4357b59 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.52-2.2.0)/imx-atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 9a7a729b45bf28ac1a5212f6bfd40311f0a96e49 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:15 -0400 Subject: [PATCH 39/88] configs/freescale_imx8mmevk: bump BSP components to lf-6.6.52-2.2.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Tested-by: Julien Olivain Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx8mmevk/patches/linux/linux.hash | 2 +- board/freescale/imx8mmevk/patches/uboot/uboot.hash | 2 +- configs/freescale_imx8mmevk_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..58100572e4 100644 --- a/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 2b5b4a370a55b790ca318e95e2c1aac9d9166ea549179ef9929c346863b4ea57 imx-atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8mmevk/patches/linux/linux.hash b/board/freescale/imx8mmevk/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx8mmevk/patches/linux/linux.hash +++ b/board/freescale/imx8mmevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8mmevk/patches/uboot/uboot.hash b/board/freescale/imx8mmevk/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx8mmevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8mmevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index b5b52c1f2d..3807b8ada7 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" @@ -21,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.52-2.2.0)/imx-atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From ca24f2d6d8309d9f6fc5e4af74324f7eae158b5a Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:16 -0400 Subject: [PATCH 40/88] configs/freescale_imx8dxlevk: bump BSP components to lf-6.6.52-2.2.0 Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/imx8dxlevk/patches/linux/linux.hash | 2 +- board/freescale/imx8dxlevk/patches/uboot/uboot.hash | 2 +- configs/freescale_imx8dxlevk_defconfig | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..58100572e4 100644 --- a/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 2b5b4a370a55b790ca318e95e2c1aac9d9166ea549179ef9929c346863b4ea57 imx-atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8dxlevk/patches/linux/linux.hash b/board/freescale/imx8dxlevk/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx8dxlevk/patches/linux/linux.hash +++ b/board/freescale/imx8dxlevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx8dxlevk/patches/uboot/uboot.hash b/board/freescale/imx8dxlevk/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx8dxlevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8dxlevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx8dxlevk_defconfig b/configs/freescale_imx8dxlevk_defconfig index 1ee1413eb0..c3017074c9 100644 --- a/configs/freescale_imx8dxlevk_defconfig +++ b/configs/freescale_imx8dxlevk_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8dxl-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8dxl-evk" @@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.52-2.2.0)/imx-atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8dxl" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8dxl_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 850e71c6afe76dcd5d1f97262beff4319ade0a2e Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:17 -0400 Subject: [PATCH 41/88] configs/freescale_imx7dsabresd: bump BSP components to lf-6.6.52-2.2.0 Bump U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- board/freescale/imx7dsdb/patches/linux/linux.hash | 2 +- board/freescale/imx7dsdb/patches/uboot/uboot.hash | 2 +- configs/freescale_imx7dsabresd_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/freescale/imx7dsdb/patches/linux/linux.hash b/board/freescale/imx7dsdb/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx7dsdb/patches/linux/linux.hash +++ b/board/freescale/imx7dsdb/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx7dsdb/patches/uboot/uboot.hash b/board/freescale/imx7dsdb/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx7dsdb/patches/uboot/uboot.hash +++ b/board/freescale/imx7dsdb/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index a9df6671ce..83a3f4494a 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -7,7 +7,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y From 731922527667d54ffc2c8d185224c5ab60b05ebb Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:18 -0400 Subject: [PATCH 42/88] configs/freescale_imx6ullevk: bump BSP components to lf-6.6.52-2.2.0 Bump U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions. Signed-off-by: Gilles Talis Signed-off-by: Julien Olivain --- board/freescale/imx6ullevk/patches/linux/linux.hash | 2 +- board/freescale/imx6ullevk/patches/uboot/uboot.hash | 2 +- configs/freescale_imx6ullevk_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/freescale/imx6ullevk/patches/linux/linux.hash b/board/freescale/imx6ullevk/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx6ullevk/patches/linux/linux.hash +++ b/board/freescale/imx6ullevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx6ullevk/patches/uboot/uboot.hash b/board/freescale/imx6ullevk/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx6ullevk/patches/uboot/uboot.hash +++ b/board/freescale/imx6ullevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index e29a9898fc..6474228c64 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -8,7 +8,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6ullevk/linux_sdma.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y From f907f2a0feb291b7a6b70e24dae7cf69ec9c6ec8 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 1 Mar 2025 10:26:19 -0400 Subject: [PATCH 43/88] configs/freescale_imx6{dl, q, sx}*: bump BSP components to lf-6.6.52-2.2.0 Note: configs/freescale_imx6{dl,q,sx}* corresponds to the five: freescale_imx6dlsabreauto_defconfig freescale_imx6dlsabresd_defconfig freescale_imx6qsabreauto_defconfig freescale_imx6qsabresd_defconfig freescale_imx6sxsabresd_defconfig Those i.MX6 Sabre defconfigs have a lot in common. This is why they are all updated at once in this single commit. This commit bumps U-Boot and Linux kernel to the NXP BSP lf-6.6.52-2.2.0 versions Signed-off-by: Gilles Talis Tested-by: Julien Olivain Signed-off-by: Julien Olivain --- board/freescale/imx6sabre/patches/linux/linux.hash | 2 +- board/freescale/imx6sabre/patches/uboot/uboot.hash | 2 +- configs/freescale_imx6dlsabreauto_defconfig | 4 ++-- configs/freescale_imx6dlsabresd_defconfig | 4 ++-- configs/freescale_imx6qsabreauto_defconfig | 4 ++-- configs/freescale_imx6qsabresd_defconfig | 4 ++-- configs/freescale_imx6sxsabresd_defconfig | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/board/freescale/imx6sabre/patches/linux/linux.hash b/board/freescale/imx6sabre/patches/linux/linux.hash index 3c4223976b..620a7377ef 100644 --- a/board/freescale/imx6sabre/patches/linux/linux.hash +++ b/board/freescale/imx6sabre/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 6567dd20dbcdff19da1d005acde949b20874cace5e34bf2b8e90d14fcd130174 linux-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/imx6sabre/patches/uboot/uboot.hash b/board/freescale/imx6sabre/patches/uboot/uboot.hash index 4e0d729ca0..4b763ba3ba 100644 --- a/board/freescale/imx6sabre/patches/uboot/uboot.hash +++ b/board/freescale/imx6sabre/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 5acad057c9c5e802536abf84b9fcb4405b8f701e13da1294e0d90bc6c186639d uboot-imx-lf-6.6.52-2.2.0.tar.gz diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 02970a8c6d..bf0a7786bb 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabreauto" @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index daedb68e96..0809a5e11b 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabresd" @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 9c95576758..3fee47af20 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabreauto" @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 54d0a6c3a8..1a56c0732f 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd" @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 1389629b85..df6a34c6ff 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.52-2.2.0)/linux-imx-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-sdb" @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.52-2.2.0)/uboot-imx-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y From 1b1696b408ad3b9cab1e2b68151c38470806e0e8 Mon Sep 17 00:00:00 2001 From: Boerge Struempfel Date: Wed, 5 Mar 2025 10:13:07 +0100 Subject: [PATCH 44/88] package/libgpiod2: bump to version 2.2.1 multiple bugfixes, see [0] [0] https://web.git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/tree/NEWS?h=v2.2.1 Signed-off-by: Boerge Struempfel Signed-off-by: Julien Olivain --- package/libgpiod2/libgpiod2.hash | 2 +- package/libgpiod2/libgpiod2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgpiod2/libgpiod2.hash b/package/libgpiod2/libgpiod2.hash index f51cc80b9f..2845a0ad94 100644 --- a/package/libgpiod2/libgpiod2.hash +++ b/package/libgpiod2/libgpiod2.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 ee29735890eb1cc0e4b494001da5163d1a9c4735343201d22485db313601ca07 libgpiod-2.2.tar.xz +sha256 0e948049c309b87c220fb24ee0d605d7cd5b72f22376e608470903fffa2d4b18 libgpiod-2.2.1.tar.xz # Hash for license file sha256 f646ad5159efb51c1130a4b43c31f0759750b1e254d2acf510f368ee2e2085c3 COPYING diff --git a/package/libgpiod2/libgpiod2.mk b/package/libgpiod2/libgpiod2.mk index e73f8d699f..9b47ab7c2a 100644 --- a/package/libgpiod2/libgpiod2.mk +++ b/package/libgpiod2/libgpiod2.mk @@ -6,7 +6,7 @@ # Be careful when bumping versions. # Dependency on kernel header versions may change. -LIBGPIOD2_VERSION = 2.2 +LIBGPIOD2_VERSION = 2.2.1 LIBGPIOD2_SOURCE = libgpiod-$(LIBGPIOD2_VERSION).tar.xz LIBGPIOD2_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD2_LICENSE = LGPL-2.1+ From 7a0725723b80ebf5fb0984410f7b4b665f9ee49d Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 3 Mar 2025 05:15:51 +0100 Subject: [PATCH 45/88] package/sysklogd: bump to v2.7.1 - Update syslogd -T documentation, it applies to messages originating both locally and from remote syslog servers - Fix hostname filtering support, introduced in v2.7.0, broken - Fix parsing of userspace messages in /dev/kmsg, inserted an extra space before the message payload From https://github.com/troglobit/sysklogd/releases/tag/v2.7.1 Signed-off-by: Joachim Wiberg Signed-off-by: Julien Olivain --- package/sysklogd/sysklogd.hash | 4 ++-- package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 4024965e23..645bc6a0ae 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,4 +1,4 @@ -# Upstream .sha256 from https://github.com/troglobit/sysklogd/releases/tag/v2.7.0 -sha256 6ab74ab5001121bb32697fd2f7ab3cc4b4452c3f721677e06e5b60982a04d0cc sysklogd-2.7.0.tar.gz +# Upstream .sha256 from https://github.com/troglobit/sysklogd/releases/tag/v2.7.1 +sha256 69944b2227647bf47ee01c9f482d19a79dbf2b53b8ce8ded0486b08db8c68c40 sysklogd-2.7.1.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index e8b7fe2062..a3e27fd17b 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.7.0 +SYSKLOGD_VERSION = 2.7.1 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE From 2a33198c47aa1d9567b29ea751406504fb6b30d6 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 4 Mar 2025 12:25:57 +0100 Subject: [PATCH 46/88] package/python-dbus-fast: bump to 2.34.0 See [1] for changelog. [1] https://github.com/Bluetooth-Devices/dbus-fast/blob/v2.34.0/CHANGELOG.md Signed-off-by: Marcin Niestroj [Julien: update changelog link on 2.34.0 tag] Signed-off-by: Julien Olivain --- package/python-dbus-fast/python-dbus-fast.hash | 4 ++-- package/python-dbus-fast/python-dbus-fast.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash index 6b39f6ed1a..40b09eff0a 100644 --- a/package/python-dbus-fast/python-dbus-fast.hash +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dbus-fast/json -md5 a87b903c08a6320b6b4aed9f6ee48376 dbus_fast-2.33.0.tar.gz -sha256 da2f3a2f2e10092c67a911578135c2244d04b52ec87dda80997bf65e78f79251 dbus_fast-2.33.0.tar.gz +md5 b8c9e11eb30efee1a5832bb606264e45 dbus_fast-2.34.0.tar.gz +sha256 32aa03b4b102e7ad8caf39c708e3c263ef73121a4bb64f3f877c5cf0bad91e45 dbus_fast-2.34.0.tar.gz # Locally computed sha256 checksums sha256 c37e9c75110e01d1f0c5360dc7d7776a30ac5f70d2440db214423e4b7a77a6af LICENSE diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index 4e4964891d..c2dccd073c 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DBUS_FAST_VERSION = 2.33.0 +PYTHON_DBUS_FAST_VERSION = 2.34.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz -PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/7d/42/7a6537132dc63056509fb112517a6b5a591770df1a49892aaf90864bc7db +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/0c/bc/a124a2bcd99063bd07e035b8d82437f152334a459c2497d06f77963f7b95 PYTHON_DBUS_FAST_SETUP_TYPE = poetry PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE From 94a7f909e9cad61944063d9ddd07840a976988be Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 4 Mar 2025 12:25:12 +0100 Subject: [PATCH 47/88] package/python-pytest: bump to version 8.3.5 See [1] for changelog. [1] https://github.com/pytest-dev/pytest/releases/tag/8.3.5 Signed-off-by: Marcin Niestroj Signed-off-by: Julien Olivain --- package/python-pytest/python-pytest.hash | 4 ++-- package/python-pytest/python-pytest.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index 31983da0b5..c59666a854 100644 --- a/package/python-pytest/python-pytest.hash +++ b/package/python-pytest/python-pytest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest/json -md5 542c4e802eeac1d196482e90a36533ed pytest-8.3.4.tar.gz -sha256 965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761 pytest-8.3.4.tar.gz +md5 f22d0f0e12aee3b97225a89504d657cb pytest-8.3.5.tar.gz +sha256 f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845 pytest-8.3.5.tar.gz # Locally computed sha256 checksums sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index be40fdb0fd..fcb064b35d 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 8.3.4 +PYTHON_PYTEST_VERSION = 8.3.5 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/05/35/30e0d83068951d90a01852cb1cef56e5d8a09d20c7f511634cc2f7e0372a +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/ae/3c/c9d525a414d506893f0cd8a8d0de7706446213181570cdbd766691164e40 PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE From 66adee919d111dfc8312fc9313cd4b454769ea86 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Mar 2025 16:25:44 +0100 Subject: [PATCH 48/88] {toolchain, linux-headers}: add support for 6.13 headers And add (and default to) 6.13 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index a229630aba..3efdb8b531 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 283ecb0784f3fbc16dd822fb1d9642e230ec7515ed33f120e551b839f355e6e2 linux-6.13.5.tar.xz sha256 5c205cd34f80974e4973e321cb008f5f6895a8aa8c2577f06a9448cd77de63b3 linux-6.12.17.tar.xz sha256 6cf911d01324f45c9dd2f44cf06f55bda0ecf383bc498f132a0c549768531327 linux-6.6.80.tar.xz sha256 9d63e3bfde75a44a99e18812b002e5e5c0797b4eb3db408a7a9225c2c719b52b linux-6.1.129.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 54d5720af2..ff56581b03 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_12 + default BR2_KERNEL_HEADERS_6_13 help Select the kernel version to get headers from. @@ -47,6 +47,10 @@ config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_12 bool "Linux 6.12.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + +config BR2_KERNEL_HEADERS_6_13 + bool "Linux 6.13.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -125,8 +129,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_13 + bool "6.13.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12 - bool "6.12.x or later" + bool "6.12.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11 @@ -434,6 +442,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.129" if BR2_KERNEL_HEADERS_6_1 default "6.6.80" if BR2_KERNEL_HEADERS_6_6 default "6.12.17" if BR2_KERNEL_HEADERS_6_12 + default "6.13.5" if BR2_KERNEL_HEADERS_6_13 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 94723da141..2290d13ad0 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -645,6 +645,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -658,6 +662,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 default "6.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 default "6.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 2dc04747b3..e1ecf06e4a 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -166,8 +166,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_13 + bool "6.13.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_12 - bool "6.12.x or later" + bool "6.12.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_11 From b891981d504aee5ed586d8466cbc70bb7b37ade9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Mar 2025 16:25:45 +0100 Subject: [PATCH 49/88] linux: bump latest version to 6.13 Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 30fc9f095f..15a1e57c95 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.12)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.13)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 if BR2_KERNEL_HEADERS_AS_KERNEL # mips always generates an ITB image select BR2_PACKAGE_HOST_UBOOT_TOOLS if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el @@ -137,7 +137,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.12.17" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.13.5" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From ad5445a347ccec583c133c5476c7751c5448a920 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 3 Mar 2025 18:02:45 +0100 Subject: [PATCH 50/88] boot/arm-trusted-firmware: add lts-v2.12.x selection There is a new lts-v2.12.x branch. Add it to the selection Signed-off-by: Dario Binacchi Signed-off-by: Julien Olivain --- boot/arm-trusted-firmware/Config.in | 6 ++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- .../lts-v2.12.1/arm-trusted-firmware.hash | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 boot/arm-trusted-firmware/lts-v2.12.1/arm-trusted-firmware.hash diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index c8deede9cd..becc3f69c3 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -16,6 +16,11 @@ choice config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION bool "v2.12" +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION + bool "latest lts-v2.12.x" + help + Select the latest LTS v2.12.x version available + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION bool "latest lts-v2.10.x" help @@ -53,6 +58,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string default "v2.12" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "lts-v2.12.1" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION default "lts-v2.10.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION default "lts-v2.8.20" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 172a930b5c..dca16d3960 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -20,7 +20,7 @@ ARM_TRUSTED_FIRMWARE_SITE = https://git.trustedfirmware.org/TF-A/trusted-firmwar ARM_TRUSTED_FIRMWARE_SITE_METHOD = git # The licensing of custom or from-git versions is unknown. # This is valid only for the latest (i.e. known) version. -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif diff --git a/boot/arm-trusted-firmware/lts-v2.12.1/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/lts-v2.12.1/arm-trusted-firmware.hash new file mode 100644 index 0000000000..649ae8df44 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.12.1/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3ab7e90d6fc3364815ad7770d7aa7af9cfd68edde43da7123f5f38f80e034c44 arm-trusted-firmware-lts-v2.12.1-git4.tar.gz +sha256 b2c79635797bafcde84c6edadadde290b9d5e05deb3ea16a847210fd2ca83669 docs/license.rst From 4f0c7b0dcb48d5e9e9fc54ce49c1771f7e49f54a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 7 Mar 2025 00:49:19 +0100 Subject: [PATCH 51/88] package/libnss: bump version to 3.109 For release note, see: https://hg.mozilla.org/projects/nss/diff/82eb56300e9d8e1e65312acc8ed11b26de8de222/doc/rst/releases/nss_3_109.rst Signed-off-by: Giulio Benetti Signed-off-by: Julien Olivain --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 0f73002243..9244a0000d 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_108_RTM/src/SHA256SUMS -sha256 a0f6fcb5dbadc1635b43827517a979e3a6d005d0788527802a6b31e2c5f66eec nss-3.108.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_109_RTM/src/SHA256SUMS +sha256 bea46c256118cd8910202f05339627d75291f13b80054527df58419b9d29c18b nss-3.109.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 9881b382d5..bcd08b8b12 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.108 +LIBNSS_VERSION = 3.109 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 7b9a6f5373093ad8764ff48e0c4ec0beb791afa2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 7 Mar 2025 22:24:22 +0100 Subject: [PATCH 52/88] package/harfbuzz: bump to version 10.4.0 Release Notes: https://github.com/harfbuzz/harfbuzz/releases/tag/10.4.0 Signed-off-by: Giulio Benetti Signed-off-by: Julien Olivain --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 561b9089e0..abe7440259 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd63fc3cbae32622588e46e0670fabf78ee6cff44a6348ca7f037dae9a32f9ea harfbuzz-10.3.0.tar.xz +sha256 480b6d25014169300669aa1fc39fb356c142d5028324ea52b3a27648b9beaad8 harfbuzz-10.4.0.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index db99199278..45168a0e02 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 10.3.0 +HARFBUZZ_VERSION = 10.4.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 2af019a1bd3e4d9d8a3600cf12682a14acb6e965 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 7 Mar 2025 08:56:05 +0100 Subject: [PATCH 53/88] package/libsigc2: bump to version 2.12.1 https://github.com/libsigcplusplus/libsigcplusplus/blob/2.12.1/NEWS Signed-off-by: Daniel Lang Signed-off-by: Julien Olivain --- package/libsigc2/libsigc2.hash | 4 ++-- package/libsigc2/libsigc2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsigc2/libsigc2.hash b/package/libsigc2/libsigc2.hash index 4811213568..e7bf7d4e7d 100644 --- a/package/libsigc2/libsigc2.hash +++ b/package/libsigc2/libsigc2.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libsigc++/2.12/libsigc++-2.12.0.sha256sum -sha256 1c466d2e64b34f9b118976eb21b138c37ed124d0f61497df2a90ce6c3d9fa3b5 libsigc++-2.12.0.tar.xz +# From https://download.gnome.org/sources/libsigc++/2.12/libsigc++-2.12.1.sha256sum +sha256 a9dbee323351d109b7aee074a9cb89ca3e7bcf8ad8edef1851f4cf359bd50843 libsigc++-2.12.1.tar.xz # Locally calculated sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libsigc2/libsigc2.mk b/package/libsigc2/libsigc2.mk index 845d03ba85..b5685fd50a 100644 --- a/package/libsigc2/libsigc2.mk +++ b/package/libsigc2/libsigc2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSIGC2_VERSION_MAJOR = 2.12 -LIBSIGC2_VERSION = $(LIBSIGC2_VERSION_MAJOR).0 +LIBSIGC2_VERSION = $(LIBSIGC2_VERSION_MAJOR).1 LIBSIGC2_SOURCE = libsigc++-$(LIBSIGC2_VERSION).tar.xz LIBSIGC2_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC2_VERSION_MAJOR) LIBSIGC2_INSTALL_STAGING = YES From 99a73492f855c05ad563825d1204d6c41b9f28be Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 10 Mar 2025 15:10:48 +0100 Subject: [PATCH 54/88] package/sdl2: bump version to 2.32.2 Release notes: https://github.com/libsdl-org/SDL/releases/tag/release-2.32.2 Signed-off-by: Michael Fischer Signed-off-by: Julien Olivain --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 9171139889..140de28eae 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.12.tar.gz.sig -sha256 ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea SDL2-2.30.12.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.32.2.tar.gz.sig +sha256 c5f30c427fd8107ee4a400c84d4447dd211352512eaf0b6e89cc6a50a2821922 SDL2-2.32.2.tar.gz # Locally calculated sha256 97f35b302b361680ec1e891e95d2d52097bb95abff361434916d99dc1305f127 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 67a4978e22..8e4d7700c0 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.30.12 +SDL2_VERSION = 2.32.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From bc933199e0a850afe54ae5372d68aa9b76137822 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 10 Mar 2025 13:08:31 +0100 Subject: [PATCH 55/88] package/raspberrypi-usbboot: bump version to 20250227-132106 32-bit mass-storage-gadget has been replaced with mass-storage-gadget64. Drop patch included upstream. Upstream diff: https://github.com/raspberrypi/usbboot/compare/20240926-102326...20250227-132106 Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - ...akefile-allow-passing-CFLAGS-LDFLAGS.patch | 34 ------------------- .../raspberrypi-usbboot.hash | 2 +- .../raspberrypi-usbboot.mk | 2 +- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch diff --git a/.checkpackageignore b/.checkpackageignore index 08285eadcc..e38d576a20 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1048,7 +1048,6 @@ package/qt5/qt5webkit/0006-Warnings-due-to-AppSinkCallbacks-struct-growth-https. package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch lib_patch.Upstream package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch lib_patch.Upstream package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch lib_patch.Upstream -package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch lib_patch.Upstream package/read-edid/0001-Fix-install-file-list.patch lib_patch.Upstream package/read-edid/0002-Fix-compiler-check.patch lib_patch.Upstream package/read-edid/0003-fix-build-with-gcc-10.patch lib_patch.Upstream diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch deleted file mode 100644 index fe2614d35e..0000000000 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d580bf031011d1e1e022ab1e1024f7cc5939f956 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Dec 2016 23:09:44 +0100 -Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS - -This might be needed to pass some custom CFLAGS/LDFLAGS when building -rpiboot. - -Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 -Signed-off-by: Thomas Petazzoni -[Rebased on 9324fd7] -Signed-off-by: Peter Seiderer -[Rebased on 20240926-102326-0-g82d8755] -Signed-off-by: Fiona Klute (WIWA) ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d2f7585..9812d6d 100755 ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "") - INSTALL_PREFIX?=/usr - - rpiboot: main.c bootfiles.c decode_duid.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h -- $(CC) -Wall -Wextra -g -o $@ main.c bootfiles.c decode_duid.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" -+ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ main.c bootfiles.c decode_duid.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(LDFLAGS) - - %.h: %.bin ./bin2c - ./bin2c $< $@ --- -2.45.2 - diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 413fe88f03..e17be5f411 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2ce52a9f1de1aab39daa10fa487c55d20d34f679d11b1a1743d0ef81ffb3c726 raspberrypi-usbboot-20240926-102326-git4.tar.gz +sha256 339b1e2a0853ad700339206a2424c3fc9559518bc37ebfaac76b0484cf6f5bdb raspberrypi-usbboot-20250227-132106-git4.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 3135741e9b..dd7a2a1b24 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 20240926-102326 +RASPBERRYPI_USBBOOT_VERSION = 20250227-132106 RASPBERRYPI_USBBOOT_SITE = https://github.com/raspberrypi/usbboot.git RASPBERRYPI_USBBOOT_SITE_METHOD = git RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 From fb8300f4b7dad2cdc54d6b733347afab9b1d6cd6 Mon Sep 17 00:00:00 2001 From: Benjamin Kamath Date: Sun, 9 Mar 2025 17:37:19 -0700 Subject: [PATCH 56/88] package/lapack: bump to version 3.12.1 Released in January 2025 - Updated LICENSE sha for changed year https://www.netlib.org/lapack/lapack-3.12.1.html Signed-off-by: Benjamin Kamath Signed-off-by: Julien Olivain --- package/lapack/lapack.hash | 4 ++-- package/lapack/lapack.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lapack/lapack.hash b/package/lapack/lapack.hash index 4d4d2c0596..243f6998ef 100644 --- a/package/lapack/lapack.hash +++ b/package/lapack/lapack.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cd005cd021f144d7d5f7f33c943942db9f03a28d110d6a3b80d718a295f7f714 lapack-3.10.1.tar.gz -sha256 44f7c08ab11e40b21d8bf8220712929ba8d0204645d2174869acf915562d0969 LICENSE +sha256 2ca6407a001a474d4d4d35f3a61550156050c48016d949f0da0529c0aa052422 lapack-3.12.1.tar.gz +sha256 978539245c405775bf347b1256c36df4daf8b69a64b099e94b1d53742201621e LICENSE diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 3c1ab1fc67..e3b914a94f 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LAPACK_VERSION = 3.10.1 +LAPACK_VERSION = 3.12.1 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) From 086f8472d6325b137985f3b1b817b08815dd5c87 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 10 Mar 2025 23:18:38 +0100 Subject: [PATCH 57/88] package/minicom: bump to version 2.10 Release Notes: https://salsa.debian.org/minicom-team/minicom/-/releases/2.10 Signed-off-by: Giulio Benetti Signed-off-by: Julien Olivain --- package/minicom/minicom.hash | 2 +- package/minicom/minicom.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/minicom/minicom.hash b/package/minicom/minicom.hash index dd10450262..92a50d010c 100644 --- a/package/minicom/minicom.hash +++ b/package/minicom/minicom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9efbb6458140e5a0de445613f0e76bcf12cbf7a9892b2f53e075c2e7beaba86c minicom-2.9.tar.bz2 +sha256 90e7ce2856b3eaaa3f452354d17981c49d32c426a255b6f0d3063a227c101538 minicom-2.10.tar.bz2 sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk index 8bc5717417..0c9b1ae434 100644 --- a/package/minicom/minicom.mk +++ b/package/minicom/minicom.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINICOM_VERSION = 2.9 +MINICOM_VERSION = 2.10 MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.bz2 MINICOM_SITE = \ https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) From 29861832a38976911d931256e8e5a3aad526e761 Mon Sep 17 00:00:00 2001 From: Kanak Shilledar Date: Sun, 9 Mar 2025 18:32:31 +0530 Subject: [PATCH 58/88] package/sipeed-lpi4abin: add licheepi4a boot bins Sipeed LicheePi 4A requires some proprietary binaries for booting, these are provided in the th1520-boot-firmware repo [1]. These binaries are also required for the onboard sound and wifi. [1] https://github.com/revyos/th1520-boot-firmware Signed-off-by: Kanak Shilledar [Julien: - add Signed-off-by line in commit log - reindent SIPEED_LPI4ABIN_FILES with 1 tab - fix DEVELOPERS entry (remove extra 's') - add upstream url in Config.in ] Signed-off-by: Julien Olivain --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/sipeed-lpi4abin/Config.in | 8 ++++++ package/sipeed-lpi4abin/sipeed-lpi4abin.hash | 2 ++ package/sipeed-lpi4abin/sipeed-lpi4abin.mk | 26 ++++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/sipeed-lpi4abin/Config.in create mode 100644 package/sipeed-lpi4abin/sipeed-lpi4abin.hash create mode 100644 package/sipeed-lpi4abin/sipeed-lpi4abin.mk diff --git a/DEVELOPERS b/DEVELOPERS index 25cb5dc764..b28fd9167c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2055,6 +2055,9 @@ F: package/libodb-mysql/ F: package/libqb/ F: package/usbguard/ +N: Kanak Shilledar +F: package/sipeed-lpi4abin/ + N: Karoly Kasza F: package/irqbalance/ F: package/openvmtools/ diff --git a/package/Config.in b/package/Config.in index 4a81a62ec4..ce8cb95d7e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -616,6 +616,7 @@ endmenu source "package/setserial/Config.in" source "package/sg3_utils/Config.in" source "package/sigrok-cli/Config.in" + source "package/sipeed-lpi4abin/Config.in" source "package/sispmctl/Config.in" source "package/smartmontools/Config.in" source "package/smstools3/Config.in" diff --git a/package/sipeed-lpi4abin/Config.in b/package/sipeed-lpi4abin/Config.in new file mode 100644 index 0000000000..c77266eb31 --- /dev/null +++ b/package/sipeed-lpi4abin/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SIPEED_LPI4ABIN + bool "sipeed-lpi4abin" + depends on BR2_riscv + help + This package provides TH1520 SoC binary blobs for + LicheePi 4A. + + https://github.com/revyos/th1520-boot-firmware diff --git a/package/sipeed-lpi4abin/sipeed-lpi4abin.hash b/package/sipeed-lpi4abin/sipeed-lpi4abin.hash new file mode 100644 index 0000000000..9d66be164b --- /dev/null +++ b/package/sipeed-lpi4abin/sipeed-lpi4abin.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 a1c608a7b0cc641d39666a07d8bb1a73ded35385316989c3e8182d968ed89b3e sipeed-lpi4abin-44ec4e1cc82141963842ec45db0d1617f9f07e75-git4.tar.gz diff --git a/package/sipeed-lpi4abin/sipeed-lpi4abin.mk b/package/sipeed-lpi4abin/sipeed-lpi4abin.mk new file mode 100644 index 0000000000..f2338576d8 --- /dev/null +++ b/package/sipeed-lpi4abin/sipeed-lpi4abin.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# sipeed-lpi4abin +# +################################################################################ + +SIPEED_LPI4ABIN_VERSION = 44ec4e1cc82141963842ec45db0d1617f9f07e75 +SIPEED_LPI4ABIN_SITE = https://github.com/revyos/th1520-boot-firmware.git +SIPEED_LPI4ABIN_SITE_METHOD = git +SIPEED_LPI4ABIN_LICENSE = PROPRIETARY + +SIPEED_LPI4ABIN_INSTALL_IMAGES = YES +SIPEED_LPI4ABIN_INSTALL_TARGET = NO + +SIPEED_LPI4ABIN_FILES = \ + addons/boot/light_aon_fpga.bin \ + addons/boot/light_c906_audio.bin \ + addons/boot/str.bin + +define SIPEED_LPI4ABIN_INSTALL_IMAGES_CMDS + $(foreach f,$(SIPEED_LPI4ABIN_FILES), \ + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR)/bootbins $(@D)/$(f) + ) +endef + +$(eval $(generic-package)) From 1ab37899ae7c7595d3fc1ab70b67388e67e70c33 Mon Sep 17 00:00:00 2001 From: Kanak Shilledar Date: Sun, 9 Mar 2025 18:32:32 +0530 Subject: [PATCH 59/88] configs/sipeed_licheepi_4a: add new board Add support for the LicheePi 4A with mainline component: - Linux Kernel 6.12 The following components are provided by vendor: - U-Boot 2020.01 - OpenSBI v0.9 Board homepage and more usable wiki: - https://wiki.sipeed.com/hardware/en/lichee/th1520/lpi4a/1_intro.html th1520-boot-firmware is selected from the package sipeed-lpi4abin. This is inspired from lone0's fork of buildroot for th1520.[1] [1] https://github.com/lone0/buildroot-th1520 Signed-off-by: Kanak Shilledar [Julien: Tested on cpu board version 51601 on base board version 51602] Tested-by: Julien Olivain [Julien: - add Signed-off-by line in commit log - reorder defconfig entries with "make savedefconfig" - fixed post-image.sh shellcheck warnings (found with "make check-package") - add extra info in readme.txt - change linux-headers.hash to a symlink - change linux.hash comment to take hash from upstream ] Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + .../sipeed/licheepi_4a/extlinux/extlinux.conf | 4 + board/sipeed/licheepi_4a/genimage.cfg | 7 ++ .../patches/linux-headers/linux-headers.hash | 1 + .../licheepi_4a/patches/linux/linux.hash | 2 + .../licheepi_4a/patches/opensbi/opensbi.hash | 2 + .../licheepi_4a/patches/uboot/uboot.hash | 2 + board/sipeed/licheepi_4a/post-image.sh | 24 +++++ board/sipeed/licheepi_4a/readme.txt | 97 +++++++++++++++++++ configs/sipeed_licheepi_4a_defconfig | 42 ++++++++ 10 files changed, 183 insertions(+) create mode 100644 board/sipeed/licheepi_4a/extlinux/extlinux.conf create mode 100644 board/sipeed/licheepi_4a/genimage.cfg create mode 120000 board/sipeed/licheepi_4a/patches/linux-headers/linux-headers.hash create mode 100644 board/sipeed/licheepi_4a/patches/linux/linux.hash create mode 100644 board/sipeed/licheepi_4a/patches/opensbi/opensbi.hash create mode 100644 board/sipeed/licheepi_4a/patches/uboot/uboot.hash create mode 100755 board/sipeed/licheepi_4a/post-image.sh create mode 100644 board/sipeed/licheepi_4a/readme.txt create mode 100644 configs/sipeed_licheepi_4a_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index b28fd9167c..0c6d7532f8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2056,6 +2056,8 @@ F: package/libqb/ F: package/usbguard/ N: Kanak Shilledar +F: board/sipeed/licheepi_4a/ +F: configs/sipeed_licheepi_4a_defconfig F: package/sipeed-lpi4abin/ N: Karoly Kasza diff --git a/board/sipeed/licheepi_4a/extlinux/extlinux.conf b/board/sipeed/licheepi_4a/extlinux/extlinux.conf new file mode 100644 index 0000000000..add3954184 --- /dev/null +++ b/board/sipeed/licheepi_4a/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /th1520-lichee-pi-4a.dtb + append console=ttyS0,115200 root=/dev/mmcblk0p4 rootfstype=ext4 rootwait rw earlycon clk_ignore_unused init=/sbin/init diff --git a/board/sipeed/licheepi_4a/genimage.cfg b/board/sipeed/licheepi_4a/genimage.cfg new file mode 100644 index 0000000000..54cef1db9b --- /dev/null +++ b/board/sipeed/licheepi_4a/genimage.cfg @@ -0,0 +1,7 @@ +image boot.ext4 { + ext4 { + label = "boot" + } + + size = 64M +} diff --git a/board/sipeed/licheepi_4a/patches/linux-headers/linux-headers.hash b/board/sipeed/licheepi_4a/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/sipeed/licheepi_4a/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/sipeed/licheepi_4a/patches/linux/linux.hash b/board/sipeed/licheepi_4a/patches/linux/linux.hash new file mode 100644 index 0000000000..7835000bc9 --- /dev/null +++ b/board/sipeed/licheepi_4a/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d linux-6.12.18.tar.xz diff --git a/board/sipeed/licheepi_4a/patches/opensbi/opensbi.hash b/board/sipeed/licheepi_4a/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..5ced5c95cc --- /dev/null +++ b/board/sipeed/licheepi_4a/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 2510c0e867b4f8c28579def9a21e97fa2e8de95b8c7d66bb8b6642202bcee3b4 opensbi-61d7484c752a5e4c464d5dc18e21d9ac67fbbefa-git4.tar.gz diff --git a/board/sipeed/licheepi_4a/patches/uboot/uboot.hash b/board/sipeed/licheepi_4a/patches/uboot/uboot.hash new file mode 100644 index 0000000000..b63a8d79d4 --- /dev/null +++ b/board/sipeed/licheepi_4a/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6158b9c6faee41a1e790ad4ba2e1b3e18a122ecdb5749fa77c7495a2d1c56262 uboot-b5ee6e549a7b5ff382a14021a5d6a3c94017bddd-git4.tar.gz diff --git a/board/sipeed/licheepi_4a/post-image.sh b/board/sipeed/licheepi_4a/post-image.sh new file mode 100755 index 0000000000..6d188d7994 --- /dev/null +++ b/board/sipeed/licheepi_4a/post-image.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +BOARD_DIR="$(dirname "$0")" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +trap 'rm -rf "${ROOTPATH_TMP}"' EXIT +ROOTPATH_TMP="$(mktemp -d)" +rm -rf "${GENIMAGE_TMP}" + +cp "${BINARIES_DIR}"/Image "${BINARIES_DIR}"/*.dtb "${BINARIES_DIR}"/fw_dynamic.bin "${ROOTPATH_TMP}" +cp -a "${BINARIES_DIR}"/bootbins/* "${ROOTPATH_TMP}" +cp -a "${BOARD_DIR}"/extlinux "${ROOTPATH_TMP}" + +genimage \ + --rootpath "${ROOTPATH_TMP}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/board/sipeed/licheepi_4a/readme.txt b/board/sipeed/licheepi_4a/readme.txt new file mode 100644 index 0000000000..90a0347046 --- /dev/null +++ b/board/sipeed/licheepi_4a/readme.txt @@ -0,0 +1,97 @@ +Intro +===== + +This directory contains a Buildroot configuration for building a +LicheePi 4A image. For more information, see the board wiki page [1]. + + +How to build it +=============== + + +Configure Buildroot +------------------- + + make sipeed_licheepi_4a_defconfig + + +Build the boot and rootfs +------------------------- + +Note: you will need to have access to the network, since Buildroot +will download the packages' sources. + +You may now build your rootfs with: + + make + +(This may take a while, consider getting yourself a coffee ;-) ) + + +Result of the build +------------------- + +After building, you should obtain this tree: + + output/images/ + +-- boot.ext4 + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- rootfs.tar + +-- u-boot.bin + +-- u-boot-with-spl.bin + +-- fw_dynamic.bin + `-- Image + + +How to flash the board +====================== + +Once the build process is finished you will have to flash the +correspoding images to the respective partitions in the eMMC. +LicheePi 4A uses fastboot to flash the images. + +The board needs to be booted in "Burning Mode". For that, check first +the boot switches (SW1, SW2) on the base board are set up on the +"eMMC" mode (this is the factory default). Then, boot the board while +pressing the "BOOT" button. See [2]. + +Note that the board can be booted by either: +- attaching the USB-C power cable, or +- pressing the "RESET" button (near the USB-C power connector) if the + power cable is already connected to the host computer. + +The board should be enumerated from the host computer. This can be +confirmed with "lsusb". The board should be listed as: + + ID 2345:7654 T-HEAD USB download gadget + +The device should also be listed by the "fastboot devices" command: + + ???????????? Android Fastboot + +The board can be flashed with the commands: + + fastboot flash ram output/images/u-boot-with-spl.bin + fastboot reboot + fastboot flash uboot output/images/u-boot-with-spl.bin + fastboot flash boot output/images/boot.ext4 + fastboot flash root output/images/rootfs.ext2 + + +Boot the board +============== + +Connect the console on the System Serial Port on pins +U0-RX, U0-TX and GND. For more details, see [3]. + +When resetting or powering up the board on the USB-C port, the U-Boot +prompt and Linux console will appear on this System Serial Port. + + +References +========== + +[1] https://wiki.sipeed.com/hardware/en/lichee/th1520/lpi4a/1_intro.html +[2] https://wiki.sipeed.com/hardware/en/lichee/th1520/lpi4a/4_burn_image.html#How-to-enter-burning-mode +[3] https://wiki.sipeed.com/hardware/en/lichee/th1520/lpi4a/6_peripheral.html#System-Serial-Port diff --git a/configs/sipeed_licheepi_4a_defconfig b/configs/sipeed_licheepi_4a_defconfig new file mode 100644 index 0000000000..c7867ed05d --- /dev/null +++ b/configs/sipeed_licheepi_4a_defconfig @@ -0,0 +1,42 @@ +BR2_riscv=y +BR2_RISCV_ISA_RVC=y +BR2_RISCV_ISA_RVV=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/sipeed/licheepi_4a/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="licheepi4a" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi 4A" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/sipeed/licheepi_4a/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/th1520-lichee-pi-4a" +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88=y +BR2_PACKAGE_SIPEED_LPI4ABIN=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/revyos/thead-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="61d7484c752a5e4c464d5dc18e21d9ac67fbbefa" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="light_lpi4a" +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/revyos/thead-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b5ee6e549a7b5ff382a14021a5d6a3c94017bddd" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From e74584288c440865c21d408ec04a2b78ca70dff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Tue, 11 Mar 2025 10:58:31 +0100 Subject: [PATCH 60/88] package/zfs: bump version to 2.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For release note, see: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.1 Signed-off-by: José Luis Salvador Rufo Signed-off-by: Julien Olivain --- package/zfs/zfs.hash | 4 ++-- package/zfs/zfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 184ce27b0b..3640963bdb 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.3.0/zfs-2.3.0.sha256.asc -sha256 6e8787eab55f24c6b9c317f3fe9b0da9a665eb34c31df88ff368d9a92e9356a6 zfs-2.3.0.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.3.1/zfs-2.3.1.sha256.asc +sha256 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006 zfs-2.3.1.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 4bb32c2ae9..b2edeb1268 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.3.0 +ZFS_VERSION = 2.3.1 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL From e444597f486deb86cf8ef7ea84af8693397002c2 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 11 Mar 2025 10:43:27 +0100 Subject: [PATCH 61/88] configs/olpc_xo175_defconfig: bump kernel version to 6.13.6 Update kernel to version 6.13.6. Tested. Signed-off-by: Lubomir Rintel Signed-off-by: Julien Olivain --- configs/olpc_xo175_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/olpc_xo175_defconfig b/configs/olpc_xo175_defconfig index bb7aa047f6..f4ef283e00 100644 --- a/configs/olpc_xo175_defconfig +++ b/configs/olpc_xo175_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_pj4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_13=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/olpc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olpc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.13.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1.75/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olpc/linux.config" From ff85110701cf884869f07b04bd041e06dcac3018 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Tue, 11 Mar 2025 12:22:05 +0100 Subject: [PATCH 62/88] package/network-manager: bump version to 1.52.0 Upstream changelog with a mix of new features and bugfixes: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.52.0/NEWS?ref_type=tags Support for the "dhcpcanon" DHCP client has been removed. Systemd code imported into NetworkManager [1] now requires kernel headers 5.4 [2], update "depends on" accordingly. Also update the homepage, wiki.gnome.org has been retired. [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2115 [2] https://github.com/systemd/systemd/commit/6e14c46bac760d01868b0bf48461f6ac44c86be3 Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- package/network-manager/Config.in | 8 ++++---- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index de7989a9c5..b388c573fe 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # We need NETLINK_GET_STRICT_CHK - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 @@ -23,7 +23,7 @@ config BR2_PACKAGE_NETWORK_MANAGER configured and joined once, it can be detected and re-joined automatically the next time it's available. - http://projects.gnome.org/NetworkManager/ + https://networkmanager.dev/ if BR2_PACKAGE_NETWORK_MANAGER @@ -60,10 +60,10 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS This option enables support for OpenVSwitch endif -comment "NetworkManager needs udev /dev management and a glibc or musl toolchain w/ headers >= 4.20, dynamic library, wchar, threads, gcc >= 4.9" +comment "NetworkManager needs udev /dev management and a glibc or musl toolchain w/ headers >= 5.4, dynamic library, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ BR2_STATIC_LIBS || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 64ec5acbea..a0963e010f 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/1.50.2/downloads/NetworkManager-1.50.2.tar.xz.sha256sum -sha256 10473be9d3ab89f8a27a68b7bf5bc9557851a5183b74b6241e5e0fa5c6921fef NetworkManager-1.50.2.tar.xz +# From https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/1.52.0/downloads/NetworkManager-1.52.0.tar.xz.sha256sum +sha256 356f21a15da51e4218fd4d0fd78cea61e067b1116a25cddee4af9df05062e92d NetworkManager-1.52.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 1a0adacfa0..ab3a437838 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.50 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 +NETWORK_MANAGER_VERSION_MAJOR = 1.52 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/$(NETWORK_MANAGER_VERSION)/downloads NETWORK_MANAGER_INSTALL_STAGING = YES From e1cbe13462ea4305e339ff7545221e32979ce99f Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 11 Mar 2025 22:49:30 +0100 Subject: [PATCH 63/88] package/libedit: bump to 20250104-3.1 Changelog: 2025-01-04 Jess Thrysoee * all: sync with upstream source 2024-08-08 Jess Thrysoee * all: sync with upstream source * doc/Makefile.am: fix regression. Name all manpage links as el_* (e.g. el_history.3) to avoid conflicts. Reported by Zopolis4 2024-05-17 Jess Thrysoee * all: sync with upstream source Upstream changes are theoretically viewable at [1] but not in a very readable form. [1] http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit Signed-off-by: Marcus Hoffmann Signed-off-by: Julien Olivain --- package/libedit/libedit.hash | 2 +- package/libedit/libedit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index c2ed7f773f..08eb889ee2 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad libedit-20230828-3.1.tar.gz +sha256 23792701694550a53720630cd1cd6167101b5773adddcb4104f7345b73a568ac libedit-20250104-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index 98e29a9b1a..9b480958d3 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20230828-3.1 +LIBEDIT_VERSION = 20250104-3.1 LIBEDIT_SITE = https://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses From 291a3263e0993d3cba9100cf01cb3bc0c04deee7 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 12 Mar 2025 11:38:09 +0100 Subject: [PATCH 64/88] package/can-utils: bump to v2025.01 Remove patches that are now included in upstream release. Package switched from autotools to cmake based build. Backport two build fixes that are already merged upstream. * 0001-Include-time.h-for-timespec-struct-definition.patch fixes a musl build issue * 0002-CMakeLists.txt-add-an-option-to-control-shared-libra.patch fixes static only builds Release Notes: https://github.com/linux-can/can-utils/releases/tag/v2025.01 Signed-off-by: Marcus Hoffmann Signed-off-by: Julien Olivain --- ...ograms-using-fork-on-MMU-less-system.patch | 257 ------------------ ...ime.h-for-timespec-struct-definition.patch | 28 ++ ...dd-an-option-to-control-shared-libra.patch | 37 +++ ...y-poption-prefix-to-use-when-logging.patch | 79 ------ package/can-utils/can-utils.hash | 2 +- package/can-utils/can-utils.mk | 5 +- 6 files changed, 68 insertions(+), 340 deletions(-) delete mode 100644 package/can-utils/0001-Don-t-compile-programs-using-fork-on-MMU-less-system.patch create mode 100644 package/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch create mode 100644 package/can-utils/0002-CMakeLists.txt-add-an-option-to-control-shared-libra.patch delete mode 100644 package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch diff --git a/package/can-utils/0001-Don-t-compile-programs-using-fork-on-MMU-less-system.patch b/package/can-utils/0001-Don-t-compile-programs-using-fork-on-MMU-less-system.patch deleted file mode 100644 index 57f93b18e0..0000000000 --- a/package/can-utils/0001-Don-t-compile-programs-using-fork-on-MMU-less-system.patch +++ /dev/null @@ -1,257 +0,0 @@ -From 5ed3b4ded6cf3e4de6fc8c8739b84231b0285b0e Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Fri, 5 May 2023 08:57:45 +0200 -Subject: [PATCH] Don't compile programs using fork() on MMU-less systems - -Systems that lack a MMU cannot use fork() to create the child process. -The patch does not compile the affected programs on MMU-less systems. - -Co-developed-by: Marc Kleine-Budde -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Dario Binacchi -Upstream: https://github.com/linux-can/can-utils/commit/5ed3b4ded6cf3e4de6fc8c8739b84231b0285b0e ---- - CMakeLists.txt | 15 ++++++++++++--- - GNUmakefile.am | 10 +++++++--- - Makefile | 16 +++++++++++++--- - check_cc.sh | 16 ++++++++++++++++ - configure.ac | 2 ++ - fork_test.c | 27 +++++++++++++++++++++++++++ - 6 files changed, 77 insertions(+), 9 deletions(-) - create mode 100755 check_cc.sh - create mode 100644 fork_test.c - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 09ccd805de66..aee8ff7fca02 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.3) - - project(can-utils LANGUAGES C) - -+include (CheckFunctionExists) - include (CheckSymbolExists) - include (GNUInstallDirs) - -@@ -25,12 +26,13 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSCM_TXTIME=SO_TXTIME") - include_directories (.) - include_directories (./include) - -+check_function_exists(fork HAVE_FORK) -+ - set(PROGRAMS_CANLIB - asc2log - canbusload - candump - cangen -- canlogserver - canplayer - cansend - cansequence -@@ -39,6 +41,10 @@ set(PROGRAMS_CANLIB - slcanpty - ) - -+if(HAVE_FORK) -+ list(APPEND PROGRAMS_CANLIB canlogserver) -+endif() -+ - set(PROGRAMS_J1939 - j1939acd - j1939cat -@@ -49,7 +55,6 @@ set(PROGRAMS_J1939 - - set(PROGRAMS - ${PROGRAMS_CANLIB} -- bcmserver - canfdtest - cangw - cansniffer -@@ -57,13 +62,17 @@ set(PROGRAMS - isotpperf - isotprecv - isotpsend -- isotpserver - isotpsniffer - isotptun - slcan_attach - slcand - ) - -+if(HAVE_FORK) -+ list(APPEND PROGRAMS bcmserver) -+ list(APPEND PROGRAMS isotpserver) -+endif() -+ - add_executable(can-calc-bit-timing - calc-bit-timing/can-calc-bit-timing.c - ) -diff --git a/GNUmakefile.am b/GNUmakefile.am -index 5a7ad75f682e..e818754db3a4 100644 ---- a/GNUmakefile.am -+++ b/GNUmakefile.am -@@ -75,14 +75,12 @@ EXTRA_DIST += \ - - bin_PROGRAMS = \ - asc2log \ -- bcmserver \ - can-calc-bit-timing \ - canbusload \ - candump \ - canfdtest \ - cangen \ - cangw \ -- canlogserver \ - canplayer \ - cansend \ - cansequence \ -@@ -91,7 +89,6 @@ bin_PROGRAMS = \ - isotpperf \ - isotprecv \ - isotpsend \ -- isotpserver \ - isotpsniffer \ - isotptun \ - j1939acd \ -@@ -106,6 +103,13 @@ bin_PROGRAMS = \ - slcanpty \ - testj1939 - -+if HAVE_FORK -+bin_PROGRAMS += \ -+ bcmserver \ -+ canlogserver \ -+ isotpserver -+endif -+ - j1939acd_LDADD = libj1939.la - j1939cat_LDADD = libj1939.la - j1939spy_LDADD = libj1939.la -diff --git a/Makefile b/Makefile -index 29eef997b290..a26ff3d75e67 100644 ---- a/Makefile -+++ b/Makefile -@@ -45,6 +45,8 @@ MAKEFLAGS := -k - - CFLAGS := -O2 -Wall -Wno-parentheses - -+HAVE_FORK := $(shell ./check_cc.sh "$(CC)" fork_test.c) -+ - CPPFLAGS += \ - -I. \ - -Iinclude \ -@@ -66,10 +68,14 @@ PROGRAMS_ISOTP := \ - isotpperf \ - isotprecv \ - isotpsend \ -- isotpserver \ - isotpsniffer \ - isotptun - -+ifeq ($(HAVE_FORK),1) -+PROGRAMS_ISOTP += \ -+ isotpserver -+endif -+ - PROGRAMS_J1939 := \ - j1939acd \ - j1939cat \ -@@ -87,14 +93,12 @@ PROGRAMS := \ - $(PROGRAMS_J1939) \ - $(PROGRAMS_SLCAN) \ - asc2log \ -- bcmserver \ - can-calc-bit-timing \ - canbusload \ - candump \ - canfdtest \ - cangen \ - cansequence \ -- canlogserver \ - canplayer \ - cansend \ - cansniffer \ -@@ -103,6 +107,12 @@ PROGRAMS := \ - mcp251xfd-dump \ - slcanpty - -+ifeq ($(HAVE_FORK),1) -+PROGRAMS += \ -+ canlogserver \ -+ bcmserver -+endif -+ - all: $(PROGRAMS) - - clean: -diff --git a/check_cc.sh b/check_cc.sh -new file mode 100755 -index 000000000000..d85ad129da9d ---- /dev/null -+++ b/check_cc.sh -@@ -0,0 +1,16 @@ -+#!/bin/sh -+# SPDX-License-Identifier: GPL-2.0-only -+# check_cc.sh - Helper to test userspace compilation support -+# Copyright (c) 2015 Andrew Lutomirski -+ -+CC="$1" -+TESTPROG="$2" -+shift 2 -+ -+if [ -n "$CC" ] && $CC -o /dev/null "$TESTPROG" -O0 "$@"; then -+ echo 1 -+else -+ echo 0 -+fi -+ -+exit 0 -diff --git a/configure.ac b/configure.ac -index 5493c9c7ccdf..9bf62a5c6409 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,6 +76,8 @@ AC_CHECK_FUNCS([ \ - strtoul \ - ]) - -+AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork_works" = "yes") -+ - # glibc versions before 2.17 needs to link with -lrt for clock_nanosleep - AC_SEARCH_LIBS([clock_nanosleep], [rt]) - -diff --git a/fork_test.c b/fork_test.c -new file mode 100644 -index 000000000000..036692392483 ---- /dev/null -+++ b/fork_test.c -@@ -0,0 +1,27 @@ -+/* SPDX-License-Identifier: GPL-2.0-only */ -+/* -+ * Copyright (C) 2023 Dario Binacchi -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the version 2 of the GNU General Public License -+ * as published by the Free Software Foundation -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, see . -+ */ -+ -+#include -+#include -+#include -+ -+int main(int argc, char **argv) -+{ -+ fork(); -+ -+ return 0; -+} --- -2.32.0 - diff --git a/package/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch b/package/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch new file mode 100644 index 0000000000..ca7f658553 --- /dev/null +++ b/package/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch @@ -0,0 +1,28 @@ +From 2b8c7c5f4b71726806de0d718c4c56eeba2c7332 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Feb 2025 22:14:47 -0800 +Subject: [PATCH] Include time.h for timespec struct definition + +Fixes +git/isobusfs/../libj1939.h:33:18: error: field has incomplete type 'struct timespec' + 33 | struct timespec next_send_time; + | ^ +Signed-off-by: Khem Raj +Signed-off-by: Marcus Hoffmann +Upstream: https://github.com/linux-can/can-utils/commit/2b8c7c5f4b71726806de0d718c4c56eeba2c7332 +--- + libj1939.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libj1939.h b/libj1939.h +index 44393a2a..7c19f43e 100644 +--- a/libj1939.h ++++ b/libj1939.h +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + + #ifndef J1939_LIB_H diff --git a/package/can-utils/0002-CMakeLists.txt-add-an-option-to-control-shared-libra.patch b/package/can-utils/0002-CMakeLists.txt-add-an-option-to-control-shared-libra.patch new file mode 100644 index 0000000000..390ffa50e6 --- /dev/null +++ b/package/can-utils/0002-CMakeLists.txt-add-an-option-to-control-shared-libra.patch @@ -0,0 +1,37 @@ +From 59716ea66203b4d5f70dd0e41fe6f9661f8ad686 Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Wed, 12 Mar 2025 10:27:48 +0100 +Subject: [PATCH] CMakeLists.txt: add an option to control shared library + creation + +Signed-off-by: Yegor Yefremov +Signed-off-by: Marcus Hoffmann +Upstream: Backported from https://github.com/linux-can/can-utils/commit/a904183b4e65a6d982db3d12ad9d0a9a883edc1d +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 01f90f9..318a236 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,7 @@ endif() + + # Add an option to enable treating warnings as errors + option(ENABLE_WERROR "Treat all compiler warnings as errors" OFF) ++option(BUILD_SHARED_LIBS "Build shared libraries" ON) + + if(ENABLE_WERROR) + add_compile_options(-Werror) +@@ -114,7 +115,7 @@ if(NOT ANDROID) + PRIVATE can + ) + +- add_library(isobusfs SHARED ++ add_library(isobusfs + isobusfs/isobusfs_cmn.c + isobusfs/isobusfs_cmn_dh.c + ) +-- +2.43.0 + diff --git a/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch b/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch deleted file mode 100644 index 36c96d59e4..0000000000 --- a/package/can-utils/0002-j1939acd-remove-legacy-poption-prefix-to-use-when-logging.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d337863d9189501dbbb15467cc3dcba85946a2a3 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 22 Jul 2024 16:12:04 +0200 -Subject: [PATCH] j1939acd: remove legacy '-p' option (prefix to use when - logging) - -- remove legacy '-p' option (prefix to use when logging), fixes uclibc - compile - -Fixes: - - j1939acd.c: In function 'main': - j1939acd.c:489:38: error: passing argument 1 of 'asprintf' from incompatible pointer type [-Wincompatible-pointer-types] - 489 | if (asprintf(&program_invocation_name, "%s.%s", - | ^~~~~~~~~~~~~~~~~~~~~~~~ - | | - | const char ** - -Signed-off-by: Peter Seiderer -Upstream: https://github.com/linux-can/can-utils/commit/d337863d9189501dbbb15467cc3dcba85946a2a3 -Signed-off-by: Fabrice Fontaine ---- - j1939acd.c | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/j1939acd.c b/j1939acd.c -index 44bb826c..ae4e58ac 100644 ---- a/j1939acd.c -+++ b/j1939acd.c -@@ -38,7 +38,6 @@ static const char help_msg[] = - " e.g. 80,50-100,200-210 (defaults to 0-253)" "\n" - " -c, --cache=FILE Cache file to save/restore the source address" "\n" - " -a, --address=ADDRESS Start with Source Address ADDRESS" "\n" -- " -p, --prefix=STR Prefix to use when logging" "\n" - "\n" - "NAME is the 64bit nodename" "\n" - "\n" -@@ -54,14 +53,13 @@ static struct option long_opts[] = { - { "range", required_argument, NULL, 'r', }, - { "cache", required_argument, NULL, 'c', }, - { "address", required_argument, NULL, 'a', }, -- { "prefix", required_argument, NULL, 'p', }, - { }, - }; - #else - #define getopt_long(argc, argv, optstring, longopts, longindex) \ - getopt((argc), (argv), (optstring)) - #endif --static const char optstring[] = "vr:c:a:p:?"; -+static const char optstring[] = "vr:c:a:?"; - - /* byte swap functions */ - static inline int host_is_little_endian(void) -@@ -466,9 +464,6 @@ int main(int argc, char *argv[]) - struct sockaddr_can saddr; - uint64_t cmd_name; - --#ifdef _GNU_SOURCE -- program_invocation_name = program_invocation_short_name; --#endif - /* argument parsing */ - while ((opt = getopt_long(argc, argv, optstring, long_opts, NULL)) != -1) - switch (opt) { -@@ -484,15 +479,6 @@ int main(int argc, char *argv[]) - case 'a': - s.current_sa = strtoul(optarg, 0, 0); - break; -- case 'p': --#ifdef _GNU_SOURCE -- if (asprintf(&program_invocation_name, "%s.%s", -- program_invocation_short_name, optarg) < 0) -- err(1, "asprintf(program invocation name)"); --#else -- err(0, "compile with -D_GNU_SOURCE to use -p"); --#endif -- break; - default: - fputs(help_msg, stderr); - exit(1); diff --git a/package/can-utils/can-utils.hash b/package/can-utils/can-utils.hash index e539e05b45..1112e47448 100644 --- a/package/can-utils/can-utils.hash +++ b/package/can-utils/can-utils.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2790dfb57fe3ec22b6fd512838c6480c39f7c9ae193e59f1ae01221216505a7e can-utils-2023.03.tar.gz +sha256 88b30feace372c4a61e6adb2534791c0cfba6123ebcca7f59bbb76580d4a6915 can-utils-2025.01.tar.gz sha256 c3dc748f5e725cf5ed89784fe78e4ff1b05d309bf1e7ade4c572e8fde1b8406c LICENSES/BSD-3-Clause sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 LICENSES/GPL-2.0-only.txt diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk index 462e123c6d..fc5170ed9d 100644 --- a/package/can-utils/can-utils.mk +++ b/package/can-utils/can-utils.mk @@ -4,10 +4,9 @@ # ################################################################################ -CAN_UTILS_VERSION = 2023.03 +CAN_UTILS_VERSION = 2025.01 CAN_UTILS_SITE = $(call github,linux-can,can-utils,v$(CAN_UTILS_VERSION)) CAN_UTILS_LICENSE = BSD-3-Clause or GPL-2.0 CAN_UTILS_LICENSE_FILES = LICENSES/BSD-3-Clause LICENSES/GPL-2.0-only.txt -CAN_UTILS_AUTORECONF = YES -$(eval $(autotools-package)) +$(eval $(cmake-package)) From e7cbf8979845d750520accdbc8a3ca120144c38b Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Tue, 11 Mar 2025 12:25:09 +0100 Subject: [PATCH 65/88] package/libglib2: bump version to 2.84.0 Upstream changelog: https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS?ref_type=heads Note that upstream is planning to require C11 starting with 2.85.x, and encourages people who would have problems with that to file issues: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4473 Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- package/libglib2/Config.in | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 393a7f4405..a875203da7 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBGLIB2 help Low-level core library that forms the basis of GTK+ and GNOME. - http://www.gtk.org/ + https://www.gtk.org/ comment "libglib2 needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 8bd4bf157d..9bc244ff22 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.82/glib-2.82.5.sha256sum -sha256 05c2031f9bdf6b5aba7a06ca84f0b4aced28b19bf1b50c6ab25cc675277cbc3f glib-2.82.5.tar.xz +# https://download.gnome.org/sources/glib/2.84/glib-2.84.0.sha256sum +sha256 f8823600cb85425e2815cfad82ea20fdaa538482ab74e7293d58b3f64a5aff6a glib-2.84.0.tar.xz # License files, locally calculated sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 6c012c79c7..a1a3954914 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.82 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).5 +LIBGLIB2_VERSION_MAJOR = 2.84 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = https://download.gnome.org/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ From 13a8275c2a9c8f9adc5f9d65e66673f070c4a2a0 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Fri, 10 Jan 2025 22:37:49 -0800 Subject: [PATCH 66/88] package/qoriq-rcw: bump version to lf-6.6.52-2.2.0 Changelog: https://github.com/nxp-qoriq/rcw/compare/lf-6.6.23-2.0.0...lf-6.6.52-2.2.0 Signed-off-by: Akhilesh Nema Reviewed-by: Brandon Maier Signed-off-by: Julien Olivain --- package/qoriq-rcw/qoriq-rcw.hash | 2 +- package/qoriq-rcw/qoriq-rcw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index 1f664842f5..b9316582ff 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52dfb95a3d8e811609dd8a982a5c6f3ba88fac096ea8448a27b571b7c25e3a83 qoriq-rcw-lf-6.6.23-2.0.0.tar.gz +sha256 bfb992fcb396894874143257b53d14394ada48df0771f7edb55324fa932bbcdc qoriq-rcw-lf-6.6.52-2.2.0.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index c6cfe59a56..c536a12373 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_RCW_VERSION = lf-6.6.23-2.0.0 +QORIQ_RCW_VERSION = lf-6.6.52-2.2.0 QORIQ_RCW_SITE = $(call github,nxp-qoriq,rcw,$(QORIQ_RCW_VERSION)) QORIQ_RCW_LICENSE = BSD-3-Clause QORIQ_RCW_LICENSE_FILES = LICENSE From 2522130175e5d8ec5c779335b9d6f237b278df56 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Fri, 10 Jan 2025 22:37:50 -0800 Subject: [PATCH 67/88] package/qoriq-fm-ucode: bump version to lf-6.6.52-2.2.0 The package is unchanged; a new tag was added to match other NXP QorIQ package versions. Signed-off-by: Akhilesh Nema Reviewed-by: Brandon Maier Signed-off-by: Julien Olivain --- package/qoriq-fm-ucode/qoriq-fm-ucode.hash | 2 +- package/qoriq-fm-ucode/qoriq-fm-ucode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qoriq-fm-ucode/qoriq-fm-ucode.hash b/package/qoriq-fm-ucode/qoriq-fm-ucode.hash index 67efd675cc..bf494b177b 100644 --- a/package/qoriq-fm-ucode/qoriq-fm-ucode.hash +++ b/package/qoriq-fm-ucode/qoriq-fm-ucode.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c994367c74dd2ff6cd70ea269cf1bc775c5f4e11294a8db414491ce6c2eb9dc3 qoriq-fm-ucode-lf-6.6.23-2.0.0.tar.gz +sha256 6b9e2a5c383fb9288db1459821fc696f3abfeddd080b04c11cf9f712f0d36470 qoriq-fm-ucode-lf-6.6.52-2.2.0.tar.gz sha256 7a223031d76339df0e4e5a94d193a270fb9963d42b577aa42fe130a4657f3e17 LICENSE diff --git a/package/qoriq-fm-ucode/qoriq-fm-ucode.mk b/package/qoriq-fm-ucode/qoriq-fm-ucode.mk index 84360533eb..71904e5b13 100644 --- a/package/qoriq-fm-ucode/qoriq-fm-ucode.mk +++ b/package/qoriq-fm-ucode/qoriq-fm-ucode.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_FM_UCODE_VERSION = lf-6.6.23-2.0.0 +QORIQ_FM_UCODE_VERSION = lf-6.6.52-2.2.0 QORIQ_FM_UCODE_SITE = $(call github,nxp-qoriq,qoriq-fm-ucode,$(QORIQ_FM_UCODE_VERSION)) QORIQ_FM_UCODE_LICENSE = NXP Binary EULA QORIQ_FM_UCODE_LICENSE_FILES = LICENSE From a3412adb2aacb39db1a27d9d498b34647c8cfbdf Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Fri, 10 Jan 2025 22:37:51 -0800 Subject: [PATCH 68/88] package/fmlib: bump version to lf-6.6.52-2.2.0 - The license file was renamed from COPYING to LICENSE. - Added a patch to fix build errors with gcc-14. Signed-off-by: Akhilesh Nema Reviewed-by: Brandon Maier Signed-off-by: Julien Olivain --- ...conversion-error-and-enum-compare-wa.patch | 79 +++++++++++++++++++ package/fmlib/fmlib.hash | 4 +- package/fmlib/fmlib.mk | 4 +- 3 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 package/fmlib/0001-Fix-the-integer-conversion-error-and-enum-compare-wa.patch diff --git a/package/fmlib/0001-Fix-the-integer-conversion-error-and-enum-compare-wa.patch b/package/fmlib/0001-Fix-the-integer-conversion-error-and-enum-compare-wa.patch new file mode 100644 index 0000000000..e38b36128f --- /dev/null +++ b/package/fmlib/0001-Fix-the-integer-conversion-error-and-enum-compare-wa.patch @@ -0,0 +1,79 @@ +From 3a1962a70cec74b3dac979e52a2cbcaa8897b9c8 Mon Sep 17 00:00:00 2001 +From: Akhilesh Nema +Date: Fri, 10 Jan 2025 20:20:50 -0800 +Subject: [PATCH] Fix the integer conversion error and enum compare + warnings on build under gcc-14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Error: +src/fm_lib.c: In function ‘GetDeviceId’: +src/fm_lib.c:139:21: error: returning ‘uintptr_t’ {aka ‘long unsigned int’} from a function with return type ‘t_Handle’ {aka ‘void *’} makes pointer from integer without a cast [-Wint-conversion] + 139 | return p_Dev->id; + | ~~~~~^~~~ + +Warnings: + +src/fm_lib.c: In function ‘FM_PCD_CcRootModifyNextEngine’: +src/fm_lib.c:997:51: warning: comparison between ‘e_FmPcdEngine’ and ‘enum ioc_fm_pcd_engine’ [-Wenum-compare] + 997 | if (p_FmPcdCcNextEngineParams->nextEngine == e_IOC_FM_PCD_FR) { + | ^~ +src/fm_lib.c: In function ‘FM_PCD_MatchTableAddKey’: +src/fm_lib.c:1103:57: warning: comparison between ‘e_FmPcdEngine’ and ‘enum ioc_fm_pcd_engine’ [-Wenum-compare] + 1103 | else if (p_KeyParams->ccNextEngineParams.nextEngine == e_IOC_FM_PCD_FR) { + | ^~ +src/fm_lib.c: In function ‘FM_PCD_MatchTableModifyKeyAndNextEngine’: +src/fm_lib.c:1174:57: warning: comparison between ‘e_FmPcdEngine’ and ‘enum ioc_fm_pcd_engine’ [-Wenum-compare] + 1174 | else if (p_KeyParams->ccNextEngineParams.nextEngine == e_IOC_FM_PCD_FR) { + +Upstream: https://github.com/nxp-qoriq/fmlib/pull/1 + +Signed-off-by: Akhilesh Nema +--- + src/fm_lib.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/fm_lib.c b/src/fm_lib.c +index 4ea40ff..85b4a66 100644 +--- a/src/fm_lib.c ++++ b/src/fm_lib.c +@@ -136,7 +136,7 @@ t_Handle GetDeviceId(t_Handle h_Dev) + { + t_Device *p_Dev = (t_Device*)h_Dev; + +- return p_Dev->id; ++ return (t_Handle) p_Dev->id; + } + + +@@ -994,7 +994,7 @@ t_Error FM_PCD_CcRootModifyNextEngine(t_Handle h_CcTree, + } + + #if (DPAA_VERSION >= 11) +- if (p_FmPcdCcNextEngineParams->nextEngine == e_IOC_FM_PCD_FR) { ++ if (p_FmPcdCcNextEngineParams->nextEngine == e_FM_PCD_FR) { + t_Device *p_NextDev = (t_Device*) p_FmPcdCcNextEngineParams->params.frParams.h_FrmReplic; + params.cc_next_engine_params.params.fr_params.frm_replic_id = UINT_TO_PTR(p_NextDev->id); + } +@@ -1100,7 +1100,7 @@ t_Error FM_PCD_MatchTableAddKey(t_Handle h_CcNode, + params.key_params.cc_next_engine_params.params.kg_params.p_direct_scheme = UINT_TO_PTR(p_NextDev->id); + } + #if (DPAA_VERSION >= 11) +- else if (p_KeyParams->ccNextEngineParams.nextEngine == e_IOC_FM_PCD_FR) { ++ else if (p_KeyParams->ccNextEngineParams.nextEngine == e_FM_PCD_FR) { + t_Device *p_NextDev = (t_Device*) p_KeyParams->ccNextEngineParams.params.frParams.h_FrmReplic; + params.key_params.cc_next_engine_params.params.fr_params.frm_replic_id = UINT_TO_PTR(p_NextDev->id); + } +@@ -1171,7 +1171,7 @@ t_Error FM_PCD_MatchTableModifyKeyAndNextEngine(t_Handle h_CcNode, + params.key_params.cc_next_engine_params.params.kg_params.p_direct_scheme = UINT_TO_PTR(p_NextDev->id); + } + #if (DPAA_VERSION >= 11) +- else if (p_KeyParams->ccNextEngineParams.nextEngine == e_IOC_FM_PCD_FR) { ++ else if (p_KeyParams->ccNextEngineParams.nextEngine == e_FM_PCD_FR) { + t_Device *p_NextDev = (t_Device*) p_KeyParams->ccNextEngineParams.params.frParams.h_FrmReplic; + params.key_params.cc_next_engine_params.params.fr_params.frm_replic_id = UINT_TO_PTR(p_NextDev->id); + } +-- +2.25.1 + diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index f81b017869..edf87426df 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 64dc76c0adc3aa58bce6aba470dee7dee001d4964ccb1958e899a59d9917b21d fmlib-LSDK-21.08.tar.gz -sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca COPYING +sha256 173f1c41207e50dd3908c7dad192962240fd1a9269bca6e368f401134b3503bf fmlib-lf-6.6.52-2.2.0.tar.gz +sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca LICENSE diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 3d185979d5..601a3e16ef 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,10 +4,10 @@ # ################################################################################ -FMLIB_VERSION = LSDK-21.08 +FMLIB_VERSION = lf-6.6.52-2.2.0 FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) FMLIB_LICENSE = BSD-3-Clause -FMLIB_LICENSE_FILES = COPYING +FMLIB_LICENSE_FILES = LICENSE FMLIB_DEPENDENCIES = linux FMLIB_INSTALL_STAGING = YES From ba8a8359e988c472e16fee8db2710520f3f277fc Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Fri, 10 Jan 2025 22:37:52 -0800 Subject: [PATCH 69/88] package/fmc: bump version to lf-6.6.52-2.2.0 - The license file was renamed from COPYING to LICENSE. Signed-off-by: Akhilesh Nema Reviewed-by: Brandon Maier Signed-off-by: Julien Olivain --- package/fmc/fmc.hash | 4 ++-- package/fmc/fmc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index 961ce18ac7..8f59c94e6a 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a58514816108a16d07307f924ebceb67c7d61709e4449978763fc44ed6e1fc44 fmc-LSDK-21.08.tar.gz -sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING +sha256 13a5e327ef1d727946187fbd021513194981e42681c73e56933109af8a5889e7 fmc-lf-6.6.52-2.2.0.tar.gz +sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 LICENSE diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index 4f25545ffd..c6d36f14a0 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,10 +4,10 @@ # ################################################################################ -FMC_VERSION = LSDK-21.08 +FMC_VERSION = lf-6.6.52-2.2.0 FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT -FMC_LICENSE_FILES = COPYING +FMC_LICENSE_FILES = LICENSE FMC_DEPENDENCIES = libxml2 tclap fmlib FMC_MAKE_OPTS = \ From ce3dae7a83b2539737cb9a321a6dc73005aece4e Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Fri, 10 Jan 2025 22:37:53 -0800 Subject: [PATCH 70/88] configs/ls1046a-frwy_defconfig: bump BSP components to lf-6.6.52-2.2.0 - Updated Linux, U-Boot, and TF-A to lf-6.6.52-2.2.0 tag. - Updated readme.txt Signed-off-by: Akhilesh Nema [Julien: remove fmc and fmlib in readme.txt to reflect comment from Brandon Maier] Signed-off-by: Julien Olivain --- .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- board/freescale/ls1046a-frwy/patches/linux/linux.hash | 2 +- board/freescale/ls1046a-frwy/patches/uboot/uboot.hash | 2 +- board/freescale/ls1046a-frwy/readme.txt | 10 +++++----- configs/ls1046a-frwy_defconfig | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash index f9af28ab3c..344a6299d8 100644 --- a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4f4dc78bfb5b7391a65ae0f83856661071f666ac2bf6a9380fddbe376a8bdaaa atf-lf-6.6.23-2.0.0.tar.gz +sha256 f03dad74e5c3df8059554def03e9298b6fbd4ffdd3e940a18b7e84a60b12a37a atf-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/linux/linux.hash b/board/freescale/ls1046a-frwy/patches/linux/linux.hash index e038c22862..fa38fb1f75 100644 --- a/board/freescale/ls1046a-frwy/patches/linux/linux.hash +++ b/board/freescale/ls1046a-frwy/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6d592722e004516309f8ce33e654f1322e4d1f0f33567acb86ca19229176fd9e linux-lf-6.6.23-2.0.0.tar.gz +sha256 5665b927616a7e27e69f3f8fface6dd693b01f35d42ae4f9a0f0a10be3621487 linux-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash index a5ccd82b2b..a1e3b69376 100644 --- a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash +++ b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a2bcd7a34d4908ffbadfea731d0f0fd20f19a31cff6ff6310980e7f6743ceb24 u-boot-lf-6.6.23-2.0.0.tar.gz +sha256 00fc7bd053de19d02c990b3aa214a27c6103f4306e756f3f6d4afb12314556e4 u-boot-lf-6.6.52-2.2.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/readme.txt b/board/freescale/ls1046a-frwy/readme.txt index 4d1e0e1dcd..fb1c82067c 100644 --- a/board/freescale/ls1046a-frwy/readme.txt +++ b/board/freescale/ls1046a-frwy/readme.txt @@ -13,11 +13,11 @@ for the software NXP LSDK (Layerscape Software Development Kit), see - https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf the components from NXP are: - - rcw, lf-6.6.23-2.0.0 - - atf (fork), lf-6.6.23-2.0.0 - - uboot (fork), lf-6.6.23-2.0.0 - - qoriq-fm-ucode (blob), lf-6.6.23-2.0.0 - - linux (fork), lf-6.6.23-2.0.0 + - rcw, lf-6.6.52-2.2.0 + - atf (fork), lf-6.6.52-2.2.0 + - uboot (fork), lf-6.6.52-2.2.0 + - qoriq-fm-ucode (blob), lf-6.6.52-2.2.0 + - linux (fork), lf-6.6.52-2.2.0 Build ===== diff --git a/configs/ls1046a-frwy_defconfig b/configs/ls1046a-frwy_defconfig index 2cf0f9c8bc..52d8f0cc07 100644 --- a/configs/ls1046a-frwy_defconfig +++ b/configs/ls1046a-frwy_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-frwy/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.6.23-2.0.0)/linux-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.6.52-2.2.0)/linux-lf-6.6.52-2.2.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -25,7 +25,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.6.23-2.0.0)/atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.6.52-2.2.0)/atf-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046afrwy" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -35,7 +35,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.6.23-2.0.0)/u-boot-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.6.52-2.2.0)/u-boot-lf-6.6.52-2.2.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046afrwy_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_GENIMAGE=y From cb97f6a9b32456b33e160afbc6677db089ad9412 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Feb 2025 11:33:46 +0100 Subject: [PATCH 71/88] package/docker-engine: carry the tini init symlink tini can be used standalone, not just as an init injected by docker. As such, creating the docker-engine's init symlink does not belong to tini itself, but to docker-engine. This will also help later, when we allow docker-engine to use another init alternative, catatonit (already paclkaged in Buildroot, but not integrated with docker). Signed-off-by: Yann E. MORIN Cc: Christian Stewart Cc: Fiona Klute (WIWA) Tested-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- package/docker-engine/docker-engine.mk | 8 ++++++++ package/tini/tini.mk | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index ba4e7a4ae0..7467f13b39 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -35,6 +35,14 @@ DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT),y) +define DOCKER_ENGINE_INIT + mkdir -p $(TARGET_DIR)/usr/libexec/docker + ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init +endef +DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INIT +endif + ifneq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) DOCKER_ENGINE_TAGS += exclude_graphdriver_btrfs endif diff --git a/package/tini/tini.mk b/package/tini/tini.mk index 83e86237d4..c195c69023 100644 --- a/package/tini/tini.mk +++ b/package/tini/tini.mk @@ -31,8 +31,6 @@ endef define TINI_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/bin/tini $(TARGET_DIR)/usr/bin/tini - mkdir -p $(TARGET_DIR)/usr/libexec/docker - ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init endef # Tini's CMakeLists.txt is not suitable for Buildroot. From 022f49618cab99f7d944bf6608578ae4a5f543b3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Feb 2025 11:33:47 +0100 Subject: [PATCH 72/88] package/docker-engine: add option to support catatonit as init currently, docker-engine can only use tini as injected init. catatonit as a package exists, but it does not create the symlink that would be needed at runtime [0]. Add a choice at the docker-engine level, for which injected init to use, bringing catatonit to the integration level of tini. [0] that could be done in a post-build script, but that's not practical. Signed-off-by: Yann E. MORIN Cc: Christian Stewart Cc: Fiona Klute (WIWA) Tested-by: Fiona Klute (WIWA) [Julien: move the legacy option to a new 2025.05 section] Signed-off-by: Julien Olivain --- Config.in.legacy | 11 +++++++++ package/docker-engine/Config.in | 32 ++++++++++++++++++++++---- package/docker-engine/docker-engine.mk | 6 +++-- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f94a7db7b0..998e175d4a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,17 @@ endif ############################################################################### +comment "Legacy options removed in 2025.05" + +# BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT is still referenced in docker-engine +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT + bool "docker-engine init support is now a choice" + select BR2_LEGACY + help + docker-engine init support is now a choice. The original + setting has been adapted; be sure to review it in the + docker-engine package. + comment "Legacy options removed in 2025.02" config BR2_PACKAGE_ANGULARJS diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index e03ecceeff..6338eeeef1 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -48,16 +48,38 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS help Build the vfs filesystem driver for Docker. -config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT +choice bool "support docker-init" + default BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_TINI if BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT # legacy + help + Support providing a minimal init process for containers. + Required to use "docker run --init". + +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_NONE + bool "none" + help + Do not support docker-init. + +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_CATATONIT + bool "catatonit" + select BR2_PACKAGE_CATATONIT # runtime + help + Support providing a minimal init process for containers, + using catatonit. + +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_TINI + bool "tini" select BR2_PACKAGE_TINI # runtime help Support providing a minimal init process for containers, - using tini. Required to use "docker run --init". + using tini. - This does not change the Docker engine build, the - docker-init symlink is provided by the tini package - itself. This option only adds the dependency. +endchoice + +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_NAME + string + default "tini" if BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_TINI + default "catatonit" if BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_CATATONIT endif diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 7467f13b39..c39dc2b440 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -35,10 +35,12 @@ DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT),y) +DOCKER_ENGINE_INIT_NAME = $(call qstrip,$(BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_NAME)) +ifneq ($(DOCKER_ENGINE_INIT_NAME),) define DOCKER_ENGINE_INIT mkdir -p $(TARGET_DIR)/usr/libexec/docker - ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init + ln -sf ../../bin/$(DOCKER_ENGINE_INIT_NAME) \ + $(TARGET_DIR)/usr/libexec/docker/docker-init endef DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INIT endif From 1b81b594a9afaf88113d3411a54b8853845153f0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Feb 2025 11:33:48 +0100 Subject: [PATCH 73/88] package/catatonit: update to version 0.2.1 Signed-off-by: Yann E. MORIN Cc: Christian Stewart Tested-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- .../0001-fix-build-with-kernel-5.9.patch | 49 ------------------- package/catatonit/catatonit.hash | 2 +- package/catatonit/catatonit.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/catatonit/0001-fix-build-with-kernel-5.9.patch diff --git a/package/catatonit/0001-fix-build-with-kernel-5.9.patch b/package/catatonit/0001-fix-build-with-kernel-5.9.patch deleted file mode 100644 index 37def8e546..0000000000 --- a/package/catatonit/0001-fix-build-with-kernel-5.9.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 65e1b96bd40cb14b3729ac56bb9f1fcb77254403 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 1 Nov 2022 14:16:01 +0100 -Subject: [PATCH] fix build with kernel < 5.9 - -linux/close_range.h is only available since kernel 5.9 and -https://github.com/torvalds/linux/commit/60997c3d45d9a67daf01c56d805ae4fec37e0bd8 -resulting in the following build failure: - -catatonit.c:39:11: fatal error: linux/close_range.h: No such file or directory - 39 | # include - | ^~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/ed9a847905083175c7fcb2f2df28f9ac5b9c3313 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/openSUSE/catatonit/commit/663ad1670689143f65af3a288f90cecb7feed54f ---- - catatonit.c | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/catatonit.c b/catatonit.c -index a33f4cd..b10d9b0 100644 ---- a/catatonit.c -+++ b/catatonit.c -@@ -36,7 +36,7 @@ - #include - #include - --#ifdef HAVE_CLOSE_RANGE -+#ifdef HAVE_LINUX_CLOSE_RANGE_H - # include - #else - # include -diff --git a/configure.ac b/configure.ac -index 69e89f0..b37f146 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,7 +24,7 @@ LT_PREREQ([2.4.2]) - LT_INIT([disable-shared]) - - AC_CHECK_HEADERS([errno.h fcntl.h signal.h stdarg.h stdio.h stdlib.h unistd.h]) --AC_CHECK_HEADERS([sys/prctl.h sys/signalfd.h sys/stat.h sys/types.h sys/wait.h]) -+AC_CHECK_HEADERS([linux/close_range.h sys/prctl.h sys/signalfd.h sys/stat.h sys/types.h sys/wait.h]) - - AC_CHECK_FUNCS([close_range]) - diff --git a/package/catatonit/catatonit.hash b/package/catatonit/catatonit.hash index 9940309c76..7b13100a33 100644 --- a/package/catatonit/catatonit.hash +++ b/package/catatonit/catatonit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0cf1feffdc89c9fb52af20fc10127887a408bbd99e0424558d182b310a3dc92 catatonit-0.2.0.tar.gz +sha256 771385049516fdd561fbb9164eddf376075c4c7de3900a8b18654660172748f1 catatonit-0.2.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/catatonit/catatonit.mk b/package/catatonit/catatonit.mk index a308ea6471..aa7e60f697 100644 --- a/package/catatonit/catatonit.mk +++ b/package/catatonit/catatonit.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATATONIT_VERSION = 0.2.0 +CATATONIT_VERSION = 0.2.1 CATATONIT_SITE = $(call github,openSUSE,catatonit,v$(CATATONIT_VERSION)) CATATONIT_LICENSE = GPL-2.0+ CATATONIT_LICENSE_FILES = COPYING From 6dc177bee8b7fe1ae1607bd7c0819b0dc63397d7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Feb 2025 11:33:49 +0100 Subject: [PATCH 74/88] system: add catatonit as init system Like the existing tini, catatonit can be used as minimal init to be used as PID-1. Add it to the list of init systems, like was done for tini in 24cac9c4e6a3 (system: add tini as init system) and tinyinit in c1daa35cd950 (package/tinyinit: new package). Unlike the "main" init systems, there is no historical preference for those minimalist init systems, so just keep them alphabetically ordered. Signed-off-by: Yann E. MORIN Signed-off-by: Julien Olivain --- system/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/system/Config.in b/system/Config.in index 8f3579b7e0..8ff6c7213e 100644 --- a/system/Config.in +++ b/system/Config.in @@ -149,6 +149,16 @@ comment "systemd highly recommends Linux >= 4.15" comment "Special purpose (read help)" +config BR2_INIT_CATATONIT + bool "catatonit" + select BR2_PACKAGE_CATATONIT + select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT + help + A container init that is so simple it's effectively + brain-dead. + + https://github.com/openSUSE/catatonit + config BR2_INIT_TINI bool "tini" depends on BR2_USE_MMU # tini From cf8641b73e7f1577637bfef0ece78dd519b25d19 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:56:59 +0100 Subject: [PATCH 75/88] support/testing: set date in emulated machine When time comes to check certificates, the date and time in the emulated machine should be close enough to the actual values, so that certificate validity can be checked. Some Qemu machines have an RTC (e.g. arm vexpress-a9 has a pl031), and the kernel needs a driver for those RTC. It is not guaranteed that the machine used for a test meets those two conditions; in such a case, the time in the machine starts way back in the past (1970-01-01T00:00:00Z on sysv, or the release date of systemd). This is the case with the default kernel, so such tests do not have the proper time. Set the date to the date of the host system. This is going to be accurate to the second, which is, by far, enough for our purpose. To avoid having to consider what combination of emulated machine and kernel configuration are being used, we always set the date, as this is a generic step that should be done by the infra (like login in as root is). The Emulator() class doesn't inherit from unittest.TestCase, so we can't call any of the usual self.assertXXX() methods; instead, we just raise a standard exception, like is done a few lines above to detect the login prompt. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski Cc: Thomas Petazzoni Signed-off-by: Julien Olivain --- support/testing/infra/emulator.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index ef5be2a19e..9be1143944 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -5,6 +5,7 @@ import os import pexpect import pexpect.replwrap +import time import infra @@ -152,6 +153,10 @@ class Emulator(object): self.connect_shell() + output, exit_code = self.run(f"date @{int(time.time())}") + if exit_code: + raise SystemError("Cannot set date in virtual machine") + def connect_shell(self): extra_init_cmd = " && ".join([ 'export PAGER=cat', From 4554ab98154c50cb24e3b8417b9e76ef5a0737a5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:00 +0100 Subject: [PATCH 76/88] package/shadow: install to staging for subids When the subids feature is enabled, shadow will install a library and a header: $ sort output/build/shadow-4.16.0/.files-list.txt [...] shadow,./lib/libsubid.la shadow,./lib/libsubid.so shadow,./lib/libsubid.so.5 shadow,./lib/libsubid.so.5.0.0 [...] shadow,./usr/include/shadow/subid.h [...] Install to staging in that case. Signed-off-by: Yann E. MORIN Cc: Raphael Pavlidis Reviewed-by: Raphael Pavlidis Signed-off-by: Julien Olivain --- package/shadow/shadow.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index cea984012d..c598ad88fd 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -46,6 +46,7 @@ SHADOW_CONF_OPTS += --disable-account-tools-setuid endif ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) +SHADOW_INSTALL_STAGING = YES SHADOW_CONF_OPTS += --enable-subordinate-ids define SHADOW_SUBORDINATE_IDS_PERMISSIONS /usr/bin/newuidmap f 4755 0 0 - - - - - From 8edab9217886f6dac81626d92180019e7901fd7b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:01 +0100 Subject: [PATCH 77/88] package/conmon: depends on systemd when enabled When it detects it runs under systemd, conmon will want to log to the journal. However, it needs to be linked with libsystemd to do so and if not, will error out: Feb 22 11:10:03 buildroot conmon[199]: conmon 3b462ce6f2cc64f75c42 : Include journald in compilation path to log to systemd journal This prevents starting any container. Add a dependency to systemd when it is enabled. Signed-off-by: Yann E. MORIN Cc: Christian Stewart Signed-off-by: Julien Olivain --- package/conmon/conmon.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/conmon/conmon.mk b/package/conmon/conmon.mk index 1e57786686..ed1a2554fa 100644 --- a/package/conmon/conmon.mk +++ b/package/conmon/conmon.mk @@ -18,6 +18,10 @@ else CONMON_DISABLE_SECCOMP = 1 endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +CONMON_DEPENDENCIES += systemd +endif + define CONMON_CONFIGURE_CMDS printf '#!/bin/bash\necho "$(CONMON_DISABLE_SECCOMP)"\n' > \ $(@D)/hack/seccomp-notify.sh From c1add224622319a7c5dc66b073dba0faef98b420 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:02 +0100 Subject: [PATCH 78/88] package/slirp4netns: needs TUN support in the kernel slirp4netns needs a kernel with TUN support, so enable that and the few options it depends on. Signed-off-by: Yann E. MORIN Cc: Raphael Pavlidis Reviewed-by: Raphael Pavlidis Signed-off-by: Julien Olivain --- package/slirp4netns/slirp4netns.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/slirp4netns/slirp4netns.mk b/package/slirp4netns/slirp4netns.mk index ffcd334ab6..5923957c25 100644 --- a/package/slirp4netns/slirp4netns.mk +++ b/package/slirp4netns/slirp4netns.mk @@ -12,4 +12,13 @@ SLIRP4NETNS_DEPENDENCIES = libcap libglib2 libseccomp slirp SLIRP4NETNS_AUTORECONF = YES +define SLIRP4NETNS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_TUN) +endef + $(eval $(autotools-package)) From 5c77357c580f84e5a2986a4155e0cfd194c44b70 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:03 +0100 Subject: [PATCH 79/88] package/skopeo: add target variant Skopeo can be used to manipulate container images, and so can be useful on target devices that are going to be used as a host to run containers. So, add a target variant for skopeo. ... with a runtime test while at it. Signed-off-by: Yann E. MORIN Cc: Christian Stewart Cc: Yann E. MORIN Signed-off-by: Julien Olivain --- package/Config.in | 1 + package/skopeo/Config.in | 25 ++++++++++++ package/skopeo/skopeo.mk | 10 +++++ support/testing/tests/package/test_skopeo.py | 41 ++++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 package/skopeo/Config.in create mode 100644 support/testing/tests/package/test_skopeo.py diff --git a/package/Config.in b/package/Config.in index ce8cb95d7e..0c9b5bb6cf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2893,6 +2893,7 @@ menu "System tools" source "package/sdbusplus/Config.in" source "package/seatd/Config.in" source "package/shadow/Config.in" + source "package/skopeo/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" diff --git a/package/skopeo/Config.in b/package/skopeo/Config.in new file mode 100644 index 0000000000..f1acc3a50f --- /dev/null +++ b/package/skopeo/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_SKOPEO + bool "skopeo" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_USE_MMU # btrfs-progs, libgpgme, lvm2 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme + depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs, lvm2 + depends on !BR2_STATIC_LIBS # lvm2 + select BR2_PACKAGE_HOST_GO + select BR2_PACKAGE_BTRFS_PROGS + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_LVM2 + help + skopeo is a command line utility that performs various + operations on container images and image repositories. + + https://github.com/containers/skopeo + +comment "skopeo needs a toolchain w/ threads, sahred libs" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS diff --git a/package/skopeo/skopeo.mk b/package/skopeo/skopeo.mk index 8e3a302e8d..b3b213983f 100644 --- a/package/skopeo/skopeo.mk +++ b/package/skopeo/skopeo.mk @@ -11,13 +11,23 @@ SKOPEO_LICENSE = Apache-2.0 SKOPEO_LICENSE_FILES = LICENSE SKOPEO_CPE_ID_VALID = YES +SKOPEO_DEPENDENCIES = \ + host-pkgconf \ + btrfs-progs \ + libgpgme \ + lvm2 + HOST_SKOPEO_DEPENDENCIES = \ host-btrfs-progs \ host-libgpgme \ host-lvm2 \ host-pkgconf +SKOPEO_GO_ENV = PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig +SKOPEO_BUILD_TARGETS = cmd/skopeo + HOST_SKOPEO_GO_ENV = PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig HOST_SKOPEO_BUILD_TARGETS = cmd/skopeo +$(eval $(golang-package)) $(eval $(host-golang-package)) diff --git a/support/testing/tests/package/test_skopeo.py b/support/testing/tests/package/test_skopeo.py new file mode 100644 index 0000000000..79c3da8b3d --- /dev/null +++ b/support/testing/tests/package/test_skopeo.py @@ -0,0 +1,41 @@ +import infra.basetest +import json +import os + + +class TestSkopeo(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PER_PACKAGE_DIRECTORIES=y + BR2_SYSTEM_DHCP="eth0" + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_SKOPEO=y + BR2_PACKAGE_HOST_GO_BIN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file, "-nic", "user,model=rtl8139"]) + self.emulator.login() + + self.assertRunOk("skopeo --version", timeout=30) + + # First, check we can reach the default registry: docker.io + output, _ = self.emulator.run( + "skopeo inspect docker://busybox:latest", + timeout=60, + ) + bb_info = json.loads("".join(output)) + self.assertEqual(bb_info["Name"], "docker.io/library/busybox") + + # Now, check we can reach an arbitrary registry: quay.io + output, _ = self.emulator.run( + "skopeo inspect docker://quay.io/quay/busybox:latest", + timeout=60, + ) + skopeo_info = json.loads("".join(output)) + self.assertEqual(skopeo_info["Name"], "quay.io/quay/busybox") From 2c7a817dc512d77400f7367818d9febc5d5de51e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:04 +0100 Subject: [PATCH 80/88] package/cgroupfs-mount: tweak the kernel config When it was introduced in 2016 with commit 0e1547a87cfd (cgroupfs-mount: new package), we did not yet have the infrastructure for package to set kernel config options, which only came 4 years later with commit 0aed4c2dae76 (linux: allow packages to set kernel config options). So at that time, the requirements for cgroupfs-mount were documented in the help for the Kconfig symbol. But now that we do have the infrastructure in place, actually use it to set the required options, and drop the list from the Kconfig entry (that would be duplication, prone to bit-rot with time, and other packages do not document their requirements in Kconfig, they just use the infra to set the options). Signed-off-by: Yann E. MORIN Signed-off-by: Julien Olivain --- package/cgroupfs-mount/Config.in | 12 +----------- package/cgroupfs-mount/cgroupfs-mount.mk | 11 +++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package/cgroupfs-mount/Config.in b/package/cgroupfs-mount/Config.in index 0b2e4ba1e7..29a40c93d1 100644 --- a/package/cgroupfs-mount/Config.in +++ b/package/cgroupfs-mount/Config.in @@ -4,16 +4,6 @@ config BR2_PACKAGE_CGROUPFS_MOUNT help cgroupfs mount and umount scripts. - requires a Linux kernel >= 3.0 with the following options - enabled: - - - CONFIG_BLK_CGROUP - - CONFIG_CGROUPS - - CONFIG_CGROUP_CPUACCT - - CONFIG_CGROUP_DEVICE - - CONFIG_CGROUP_FREEZER - - CONFIG_CGROUP_WRITEBACK - - CONFIG_CGROUP_SCHED - - CONFIG_CGROUP_PIDS + Requires a Linux kernel >= 3.0 https://github.com/tianon/cgroupfs-mount diff --git a/package/cgroupfs-mount/cgroupfs-mount.mk b/package/cgroupfs-mount/cgroupfs-mount.mk index 5af87629ea..156d584266 100644 --- a/package/cgroupfs-mount/cgroupfs-mount.mk +++ b/package/cgroupfs-mount/cgroupfs-mount.mk @@ -10,6 +10,17 @@ CGROUPFS_MOUNT_LICENSE = GPL-3.0+ CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright CGROUPFS_MOUNT_CPE_ID_VALID = YES +define CGROUPFS_MOUNT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_CGROUP) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_WRITEBACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_PIDS) +endef + define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/cgroupfs-mount $(TARGET_DIR)/usr/bin/cgroupfs-mount $(INSTALL) -D -m 0755 $(@D)/cgroupfs-umount $(TARGET_DIR)/usr/bin/cgroupfs-umount From 5ae4c36dfe392c2a0a729f2d5bc823759e83cf51 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:05 +0100 Subject: [PATCH 81/88] package/cgroupfs-v2-mount: new package Currently, the cgroupfs-mount package only mounts a cgroup v1 hierarchy, but v1 is considered legacy and obsolete, while v2 has been around for a while now, and is required by some packages (e.g. podman whines about v1). cgroupfs-mount has not had a release in almost 8 years now, and only the occasional commit since then and until more than 3 years ago. It's not going to evolve... Add a new package with a simple-enough sysv startup script, that mounts the cgroup v2 hierarchy filesystem. For systemd, there's nothing to do, as systemd handles the mount by itself. Since both cgroup v1 and v2 use the same mountpoint, we can't have both enabled at the same time, and thus we restrict the v2 to be hidden when v1 is enabled (quite a few packages select the v1; changing those would require that they be validated against v2 first...) Note that, due to limitations in Kconfig, cgroupfs-v2-mount will appear indented below cgroupfs-mount, because it has a (negative) dependency on it. This spurious indentation is unfortunate and annoying, but benign; fixing that would require breaking the dependency with a random Kconfig symbol, which we don't have, and which we decided not to introduce just for this one use-case (well, there's host-gnupg and host-gnupg2 that have the exact same issue, but meh...) Signed-off-by: Yann E. MORIN Cc: Fiona Klute Cc: Thomas Petazzoni Signed-off-by: Julien Olivain --- package/Config.in | 1 + package/cgroupfs-v2-mount/Config.in | 10 +++++ package/cgroupfs-v2-mount/S30cgroupfs2 | 44 +++++++++++++++++++ .../cgroupfs-v2-mount/cgroupfs-v2-mount.mk | 20 +++++++++ 4 files changed, 75 insertions(+) create mode 100644 package/cgroupfs-v2-mount/Config.in create mode 100644 package/cgroupfs-v2-mount/S30cgroupfs2 create mode 100644 package/cgroupfs-v2-mount/cgroupfs-v2-mount.mk diff --git a/package/Config.in b/package/Config.in index 0c9b5bb6cf..7d8540869d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2809,6 +2809,7 @@ menu "System tools" source "package/balena-engine/Config.in" source "package/bubblewrap/Config.in" source "package/cgroupfs-mount/Config.in" + source "package/cgroupfs-v2-mount/Config.in" source "package/circus/Config.in" source "package/conmon/Config.in" source "package/containerd/Config.in" diff --git a/package/cgroupfs-v2-mount/Config.in b/package/cgroupfs-v2-mount/Config.in new file mode 100644 index 0000000000..2dd2dbc089 --- /dev/null +++ b/package/cgroupfs-v2-mount/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_CGROUPFS_V2_MOUNT + bool "cgroupfs-v2-mount" + depends on !BR2_INIT_SYSTEMD + depends on !BR2_PACKAGE_CGROUPFS_MOUNT + help + Mount the cgroup v2 hierarchy filesystem. + +comment "cgroupfs-v2-mount is incompatible with cgroupfs-mount" + depends on !BR2_INIT_SYSTEMD + depends on BR2_PACKAGE_CGROUPFS_MOUNT diff --git a/package/cgroupfs-v2-mount/S30cgroupfs2 b/package/cgroupfs-v2-mount/S30cgroupfs2 new file mode 100644 index 0000000000..42839ef921 --- /dev/null +++ b/package/cgroupfs-v2-mount/S30cgroupfs2 @@ -0,0 +1,44 @@ +#!/bin/sh + +DAEMON=cgroupfs2 + +start() { + printf 'Mounting %s: ' "${DAEMON}" + mkdir -p /sys/fs/cgroup + mount -t cgroup2 none /sys/fs/cgroup + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Unmounting %s: ' "${DAEMON}" + umount /sys/fs/cgroup + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/cgroupfs-v2-mount/cgroupfs-v2-mount.mk b/package/cgroupfs-v2-mount/cgroupfs-v2-mount.mk new file mode 100644 index 0000000000..10e18d8d41 --- /dev/null +++ b/package/cgroupfs-v2-mount/cgroupfs-v2-mount.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# cgroupfs-v2-mount +# +################################################################################ + +CGROUPFS_V2_MOUNT_VERSION = +CGROUPFS_V2_MOUNT_SITE = + +define CGROUPFS_V2_MOUNT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) +endef + +define CGROUPFS_V2_MOUNT_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D \ + $(CGROUPFS_V2_MOUNT_PKGDIR)/S30cgroupfs2 \ + $(TARGET_DIR)/etc/init.d/S30cgroupfs2 +endef + +$(eval $(generic-package)) From 2795fecc50ca91d7303ae817cdfa260eabd0975e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:06 +0100 Subject: [PATCH 82/88] package/nftables: add an option to force JSON support Currently, nftables JSON support is implicit: if jansson is enabled, JSON support is enabled, otherwise it is not. Some packages will require that nftables be built with JSON support; that's the case of netavarks, for example (to come in a later patch). So, in the current state, it would mean a package would have to select jansson, although it does not itself use it, so that nftables has JSON support. This does not feel right. Instead, introduce an option to nftables, to explicitly enabled JSON support. Packages such as netavark would then just have to require JSON support in nftables. Signed-off-by: Yann E. MORIN Cc: Yegor Yefremov Signed-off-by: Julien Olivain --- package/nftables/Config.in | 7 ++++++- package/nftables/nftables.mk | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/nftables/Config.in b/package/nftables/Config.in index 833a3a38a2..514682ec48 100644 --- a/package/nftables/Config.in +++ b/package/nftables/Config.in @@ -13,9 +13,14 @@ config BR2_PACKAGE_NFTABLES http://www.netfilter.org/projects/nftables/index.html -# Legacy: this used to be handled in nftables.mk if BR2_PACKAGE_NFTABLES +# Legacy: this used to be handled in nftables.mk source "package/nftables/nftables-python/Config.in" + +config BR2_PACKAGE_NFTABLES_JSON + bool "json support" + select BR2_PACKAGE_JANSSON + endif comment "nftables needs a toolchain w/ wchar, headers >= 3.12" diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 380e553cde..f6e6a64efd 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -42,7 +42,7 @@ else NFTABLES_CONF_OPTS += --without-cli endif -ifeq ($(BR2_PACKAGE_JANSSON),y) +ifeq ($(BR2_PACKAGE_NFTABLES_JSON),y) NFTABLES_DEPENDENCIES += jansson NFTABLES_CONF_OPTS += --with-json else From 7289731adf333e92e43b53d5665fc296214befb5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:07 +0100 Subject: [PATCH 83/88] package/netavark: new package Signed-off-by: Yann E. MORIN Cc: Julien Olivain Signed-off-by: Julien Olivain --- package/Config.in | 1 + package/netavark/Config.in | 12 +++++ package/netavark/netavark.hash | 3 ++ package/netavark/netavark.mk | 92 ++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+) create mode 100644 package/netavark/Config.in create mode 100644 package/netavark/netavark.hash create mode 100644 package/netavark/netavark.mk diff --git a/package/Config.in b/package/Config.in index 7d8540869d..2e081b84d3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2560,6 +2560,7 @@ endif source "package/ndisc6/Config.in" source "package/net-tools/Config.in" source "package/netatalk/Config.in" + source "package/netavark/Config.in" source "package/netcalc/Config.in" source "package/netcat/Config.in" source "package/netcat-openbsd/Config.in" diff --git a/package/netavark/Config.in b/package/netavark/Config.in new file mode 100644 index 0000000000..cf7b731141 --- /dev/null +++ b/package/netavark/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_NETAVARK + bool "netavark" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_IPTABLES if !BR2_PACKAGE_NFTABLES # runtime + select BR2_PACKAGE_NFTABLES_JSON if BR2_PACKAGE_NFTABLES && !BR2_PACKAGE_IPTABLES + help + Netavark is a rust based network stack for containers. It + is being designed to work with Podman but is also applicable + for other OCI container management applications. + + https://github.com/containers/netavark diff --git a/package/netavark/netavark.hash b/package/netavark/netavark.hash new file mode 100644 index 0000000000..585763be42 --- /dev/null +++ b/package/netavark/netavark.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 09471bd116fdebfd3f7a8100b37809e3a306d0f18e5feee8445ed1e01a22e0aa netavark-v1.14.0-git4-cargo2.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/netavark/netavark.mk b/package/netavark/netavark.mk new file mode 100644 index 0000000000..c96912ef5a --- /dev/null +++ b/package/netavark/netavark.mk @@ -0,0 +1,92 @@ +################################################################################ +# +# netavark +# +################################################################################ + +NETAVARK_VERSION = v1.14.0 +NETAVARK_SITE = https://github.com/containers/netavark +NETAVARK_SITE_METHOD = git + +NETAVARK_LICENSE = Apache-2.0 +NETAVARK_LICENSE_FILES = LICENSE + +# For protoc +NETAVARK_DEPENDENCIES = host-protobuf + +NETAVARK_CARGO_ENV = PROTOC=$(HOST_DIR)/bin/protoc + +# In case only nftables is enabled, use that as the firwewall backend +ifeq ($(BR2_PACKAGE_IPTABLES).$(BR2_PACKAGE_NFTABLES),.y) +define NETAVARK_CONFIG_NFTABLES + $(Q)mkdir -p $(TARGET_DIR)/etc/containers/containers.conf.d/ + printf '[network]\nfirewall_driver = "nftables"\n' \ + > $(TARGET_DIR)/etc/containers/containers.conf.d/50-buildroot-nftables.conf +endef +NETAVARK_POST_INSTALL_TARGET_HOOKS += NETAVARK_CONFIG_NFTABLES + +# See https://github.com/containers/netavark/issues/1057#issuecomment-2286149984 +define NETAVARK_LINUX_CONFIG_FIXUPS_NFTABLES + $(call KCONFIG_ENABLE_OPT,CONFIG_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_NUMGEN) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_CT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FLOW_OFFLOAD) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_CONNLIMIT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_LOG) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_LIMIT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_MASQ) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REDIR) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_TUNNEL) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_QUEUE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_QUOTA) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_COMPAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_HASH) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_XFRM) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_SOCKET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_TPROXY) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_SYNPROXY) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_DUP_NETDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FWD_NETDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB_NETDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT_NETDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT_IPV4) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_DUP_IPV4) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB_IPV4) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_COMPAT_ARP) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_DUP_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_BRIDGE_META) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_BRIDGE_REJECT) +endef +endif + +define NETAVARK_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_COMMENT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MARK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) + $(NETAVARK_LINUX_CONFIG_FIXUPS_NFTABLES) +endef + +$(eval $(cargo-package)) From ebbaac08e3f462bf023c12077f739ed1c0543eb2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:08 +0100 Subject: [PATCH 84/88] package/podman: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Podman is a container manager not unlike Docker, but is daemon-less. Similarly to docker-engine, quite a few kernel config options are required; as they are very similar in goals and features, the options from docker-engine have been duplicated for podman. As that was not enough, a few additional options have been added after trial-and-error testing (they are not explicitly listed in the documentation). The documentation [0] states that seccomp can be disabled (i.e. not enabled). However, without seccomp support, starting containers requires --security-opt=seccomp=unconfined to be specified; it does not look trivial to make that the default, though [1]. Furthermore, containers are about security, so disabling a security measure does not sound too good. So we make seccomp support mandatory. Podman needs netavark as a the network backend (it missing is a hard error at runtime). It is supposed to also require aardvark-dns, an authoritative DNS resolver, but it missing does not look to adversely affect networking, so it is not used (as not even packaged in Buildroot yet). Podman can run either as the root user, or it can run rootless, i.e. by a non-root user, which requires a bit of setup (see below, in the runtime test) and a few other dependencies: slirp4netns [2] (to provide network connectivity in userland), and support for subordinate UIDs and GIDs with the shadow library. Rootless mode is one of the main selling point for podman, so we decided that this would not be configurable in Buildroot. Similar to Docker, podman can inject a minimalist init as PID1 in containers, and like Docker, this is optional; podman however by default uses catatonit as such an init [3]. As for Docker-engine, we offer a choice of which init package to use to provide podman-init. Podman requires at least three config files; they can be either per-user or system-wide: - containers.conf [4]: defines various settings for the container runtimes; - policy.json [5]: defines what signature to accept to validate images; without one such file, podman just refuses to pull images; - registries.conf [6]: defines where to pull images from; without it, podman does not know how to pull un-qualified images (i.e. images where the registry is not specified in the path, and which Docker would fetch from the Docker Hub, e.g. "busybox:latest"). For those three files, we provide a very minimal default that (in the same order as above): - uses the slirp4netns network backend for rootless operation (the default in podman is to use pasta [1], so we need to explicitly configure it to use slirp4netns); - allows pulling images which signature can't be verified; - pulls unqualified images from the Docker Hub, as is traditional. Providing actual files is going to be use-case dependent, and interested parties will have to provide their own config files, e.g. in a rootfs overlay. Finally, we add a runtime test for podman. Podman is a huge binary, and may call other huge binaries (netavark...); this can be quite slow in the emulated machine (even when running on a very fast host machine), so we use a huge timeout for all commands involving podman, even those that exit the containers, as that may need to tear down podman setup. The default kernel used in runtime tests is missing a lot of features, so we need to build our own; we use the same version as the bundled kernel. We can't use cpio either, because we need a filesystem that can be used as a lower and upper of overlayfs, which is not possible with the filesystem the cpio is extracted into; ext2 fits the bill, so we use that. We need a bit of space to store images and stuff, so let's be generous and allocate 256M. To test rootless operation, we need a non-root user that has some special setup [7]; it is easier to run the commands from the infra rather than carry a user-definition table and a rootfs overlay. We need that user to have the same prompts (main and continuation) so that the REPLWrapper still detects those; it has the unfortunate side effect that it is not immediately obvious whether a command was run as root or not, and one has to look back up in the run-log to see whether there was a transition to another user earlier. Still for rootless containers, podman/netavark expect /etc/resolv.conf to be either a plain file, or a symlink that points either deeper in /etc or anywhere in /run; if resolv.conf resolves to any other location, DNS in rootless containers does not work. This is reasonable, and is what already happens on a systemd-based system (and thus all major distributions nowadays. However, in Buildroot, we put the actual file in /tmp; this is historical, and dates back to the days where Buildroot did not have a guaranteed-writable /run. So, we work around this limitation in the test (for now). The official busybox image on the Docker Hub supports a lot of architectures, of which armv7 which we use for this runtime test. Finding a small image that also supports armv7 on other registries was a bit of a challenge; we eventually found one busybox image on quay.io, but it is not an official busybox image; still, it fits the bill, so we use it. There is no runtime test with systemd, as this requires quite some additional setup that does not look very trivial to do; when it detects it is running under systemd in rootless mode, podman expects that a full user session exists, or it whines about it every time it is started, reverting to non-systemd behaviour; getting a full user session does not look to be that trivial (PAM?), so this would not exercise the actual integration with systemd, so the test would not be meaningful, so it is not provided. This is left as an exercise to an interested party to extend the tests. PS: Hat-tip to Raphael, who provided some pointers and hints on this change, especially for rootless mode. Thanks! 👍 [0] https://podman.io/docs/installation#get-source-code [1] it looks like we can provide a custom seccomp profile, by specifying seccomp_profile="PATH" in containers.conf; that would still require seccomp support to use that file, though, so that does not change the outcome. [2] it is possible to use another backend, but it is not packaged in in Buildroot yet: https://passt.top/passt/about/#pasta-pack-a-subtle-tap-abstraction [3] podman expects a 'catatonit' helper in /usr/libexec/podman, so even if tini would be usable instead, it would not feel right to use it to impersonate catatonit. So let's assume that only catatonit is supported. [4] https://github.com/containers/common/blob/main/docs/containers.conf.5.md [5] https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md [6] https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md [7] https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md Signed-off-by: Yann E. MORIN Cc: Raphael Pavlidis Cc: Christian Stewart Cc: Julien Olivain Signed-off-by: Julien Olivain --- package/Config.in | 1 + package/podman/Config.in | 80 ++++++++ package/podman/containers.conf | 2 + package/podman/podman.hash | 3 + package/podman/podman.mk | 110 ++++++++++ package/podman/policy.json | 7 + package/podman/registries.conf | 1 + support/testing/tests/package/test_podman.py | 203 +++++++++++++++++++ 8 files changed, 407 insertions(+) create mode 100644 package/podman/Config.in create mode 100644 package/podman/containers.conf create mode 100644 package/podman/podman.hash create mode 100644 package/podman/podman.mk create mode 100644 package/podman/policy.json create mode 100644 package/podman/registries.conf create mode 100644 support/testing/tests/package/test_podman.py diff --git a/package/Config.in b/package/Config.in index 2e081b84d3..7e98256cdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2869,6 +2869,7 @@ menu "System tools" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" source "package/petitboot/Config.in" + source "package/podman/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in" source "package/procps-ng/Config.in" diff --git a/package/podman/Config.in b/package/podman/Config.in new file mode 100644 index 0000000000..41834052f4 --- /dev/null +++ b/package/podman/Config.in @@ -0,0 +1,80 @@ +config BR2_PACKAGE_PODMAN + bool "podman" + depends on BR2_USE_MMU # fork() + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # host-go + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # netavark + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp, slirp4netns + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp, slirp4netns + depends on BR2_TOOLCHAIN_HAS_THREADS # conmon, slirp4netns + depends on BR2_USE_WCHAR # conmon, slirp4netns + select BR2_PACKAGE_HOST_GO + select BR2_PACKAGE_CA_CERTIFICATES # runtime + select BR2_PACKAGE_CGROUPFS_V2_MOUNT if !BR2_PACKAGE_CGROUPFS_MOUNT && !BR2_INIT_SYSTEMD # runtime + select BR2_PACKAGE_CONMON # runtime + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_LIBSECCOMP + select BR2_PACKAGE_NETAVARK # runtime + # podman officially only supports crun, but compatible runtimes are + # also accepted. So we do the select the other way around, to match + # docker-engine's own select and thus avoid circular dependency + # issues. + select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime + select BR2_PACKAGE_SHADOW + select BR2_PACKAGE_SHADOW_SUBORDINATE_IDS + select BR2_PACKAGE_SLIRP4NETNS # runtime + help + The best free & open source container tools + + Manage containers, pods, and images with Podman. Seamlessly + work with containers and Kubernetes from your local + environment. + + https://podman.io/ + +if BR2_PACKAGE_PODMAN + +choice + bool "support podman-init" + default BR2_PACKAGE_PODMAN_INIT_CATATONIT + help + Support providing a minimal init process for containers. + Required to use "podman container run --init". + +config BR2_PACKAGE_PODMAN_INIT_NONE + bool "none" + help + Do not support docker-init. + +config BR2_PACKAGE_PODMAN_INIT_CATATONIT + bool "catatonit" + select BR2_PACKAGE_CATATONIT # runtime + help + Support providing a minimal init process for containers, + using catatonit. + +config BR2_PACKAGE_PODMAN_INIT_TINI + bool "tini" + select BR2_PACKAGE_TINI # runtime + help + Support providing a minimal init process for containers, + using tini. + +endchoice + +config BR2_PACKAGE_PODMAN_INIT_NAME + string + default "tini" if BR2_PACKAGE_PODMAN_INIT_TINI + default "catatonit" if BR2_PACKAGE_PODMAN_INIT_CATATONIT + +endif + +comment "podman needs a toolchain w/ headers >= 3.17, threads, wchar" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_USE_WCHAR diff --git a/package/podman/containers.conf b/package/podman/containers.conf new file mode 100644 index 0000000000..1db48c1905 --- /dev/null +++ b/package/podman/containers.conf @@ -0,0 +1,2 @@ +[network] +default_rootless_network_cmd = "slirp4netns" diff --git a/package/podman/podman.hash b/package/podman/podman.hash new file mode 100644 index 0000000000..734042df95 --- /dev/null +++ b/package/podman/podman.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 6c31845cbbc54a0b65c4afba224048c002b40e863c4ba7ca19355a8d333b3d19 podman-v5.4.1-git4-go2.tar.gz +sha256 62fb8a3a9621dc2388174caaabe9c2317b694bb9a1d46c98bcf5655b68f51be3 LICENSE diff --git a/package/podman/podman.mk b/package/podman/podman.mk new file mode 100644 index 0000000000..48b4cd9b27 --- /dev/null +++ b/package/podman/podman.mk @@ -0,0 +1,110 @@ +################################################################################ +# +# podman +# +################################################################################ + +PODMAN_VERSION = v5.4.1 +PODMAN_SITE = https://github.com/containers/podman +PODMAN_SITE_METHOD = git + +PODMAN_LICENSE = Apache-2.0 +PODMAN_LICENSE_FILES = LICENSE + +PODMAN_DEPENDENCIES = host-pkgconf libgpgme + +PODMAN_GOMOD = github.com/containers/podman/v5 +PODMAN_BUILD_TARGETS = cmd/podman +PODMAN_TAGS = selinux + +# https://podman.io/docs/installation#get-source-code mandates that flag be +# set, as device-mapper is not officially supported. +PODMAN_TAGS += exclude_graphdriver_devicemapper + +# This is supposedly optional, but a basic (busybox:latest) image does not +# even start without seccomp support, unless by passing extra options at +# runtime (--security-opt=seccomp=unconfined), which can't be made the default. +PODMAN_DEPENDENCIES += libseccomp +PODMAN_TAGS += seccomp + +# This is required for rootless containers, i.e containers started by non-root +PODMAN_DEPENDENCIES += shadow +PODMAN_TAGS += libsubid + +ifeq ($(BR2_PACKAGE_BTRFS_PROGS),y) +PODMAN_DEPENDENCIES += btrfs-progs +define PODMAN_LINUX_CONFIG_FIXUPS_BTRFS + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS_POSIX_ACL) +endef +else +PODMAN_TAGS += exclude_graphdriver_btrfs +endif + +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +PODMAN_DEPENDENCIES += libapparmor +PODMAN_TAGS += apparmor +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +PODMAN_DEPENDENCIES += systemd +PODMAN_TAGS += systemd +endif + +PODMAN_INIT_NAME = $(call qstrip,$(BR2_PACKAGE_PODMAN_INIT_NAME)) +ifneq ($(PODMAN_INIT_NAME),) +PODMAN_INIT_PATH = /usr/libexec/podman/$(PODMAN_INIT_NAME) +define PODMAN_HELPER_INIT + $(Q)ln -sf ../../bin/$(PODMAN_INIT_NAME) $(TARGET_DIR)$(PODMAN_INIT_PATH) + $(Q)mkdir -p $(TARGET_DIR)/etc/containers/containers.conf.d + $(Q)printf '[containers]\ninit_path = "%s"\n' "$(PODMAN_INIT_PATH)" \ + >$(TARGET_DIR)/etc/containers/containers.conf.d/50-buildroot-init.conf +endef +endif + +define PODMAN_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) + $(call KCONFIG_ENABLE_OPT,CONFIG_BPF_SYSCALL) + $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_PIDS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_BPF) + $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) + $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_USER_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECCOMP) + $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) + $(PODMAN_LINUX_CONFIG_FIXUPS_BTRFS) +endef + +define PODMAN_CONFIG + $(Q)$(INSTALL) -D -m 0644 \ + $(PODMAN_PKGDIR)/containers.conf \ + $(TARGET_DIR)/usr/share/containers/containers.conf + $(Q)$(INSTALL) -D -m 0644 \ + $(PODMAN_PKGDIR)/policy.json \ + $(TARGET_DIR)/etc/containers/policy.json + $(Q)$(INSTALL) -D -m 0644 \ + $(PODMAN_PKGDIR)/registries.conf \ + $(TARGET_DIR)/etc/containers/registries.conf +endef +PODMAN_POST_INSTALL_TARGET_HOOKS += PODMAN_CONFIG + +define PODMAN_HELPERS + $(Q)mkdir -p $(TARGET_DIR)/usr/libexec/podman + $(Q)ln -sf ../../bin/netavark $(TARGET_DIR)/usr/libexec/podman/netavark + $(Q)ln -sf ../../bin/slirp4netns $(TARGET_DIR)/usr/libexec/podman/slirp4netns + $(PODMAN_HELPER_INIT) +endef +PODMAN_POST_INSTALL_TARGET_HOOKS += PODMAN_HELPERS + +$(eval $(golang-package)) diff --git a/package/podman/policy.json b/package/podman/policy.json new file mode 100644 index 0000000000..9333053f93 --- /dev/null +++ b/package/podman/policy.json @@ -0,0 +1,7 @@ +{ + "default": [ + { + "type": "insecureAcceptAnything" + } + ] +} diff --git a/package/podman/registries.conf b/package/podman/registries.conf new file mode 100644 index 0000000000..d44d892da3 --- /dev/null +++ b/package/podman/registries.conf @@ -0,0 +1 @@ +unqualified-search-registries = ["docker.io"] diff --git a/support/testing/tests/package/test_podman.py b/support/testing/tests/package/test_podman.py new file mode 100644 index 0000000000..e2b0598961 --- /dev/null +++ b/support/testing/tests/package/test_podman.py @@ -0,0 +1,203 @@ +import infra.basetest +import json +import os + + +class PodmanBase(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_PER_PACKAGE_DIRECTORIES=y + BR2_SYSTEM_DHCP="eth0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.202" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + BR2_PACKAGE_PODMAN=y + BR2_PACKAGE_UTIL_LINUX=y + BR2_PACKAGE_UTIL_LINUX_MOUNT=y + BR2_PACKAGE_HOST_GO_BIN=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def do_test(self): + class _Emul(): + def __init__(self, orig_emulator): + self.emulator = orig_emulator + + def run(self, cmd, timeout=-1): + if timeout < 0: + timeout = 60 + return self.emulator.run(cmd, timeout) + + def stop(self): + self.emulator.stop() + + kernel_file = os.path.join(self.builddir, 'images', 'zImage') + dtb_file = os.path.join(self.builddir, 'images', 'vexpress-v2p-ca9.dtb') + ext2_file = os.path.join(self.builddir, 'images', 'rootfs.ext2') + self.emulator.boot( + arch='armv5', + kernel=kernel_file, + kernel_cmdline=[ + 'root=/dev/mmcblk0', + 'rootwait', + 'console=ttyAMA0', + ], + options=[ + '-M', 'vexpress-a9', + '-dtb', dtb_file, + '-drive', f'file={ext2_file},if=sd,format=raw', + ] + ) + self.emulator.login() + + # Trick: replace the original emulator with one that always + # adds a timeout + self.emulator = _Emul(self.emulator) + + # Do some preparation for rootless use + self.assertRunOk("mount --make-shared /") + self.assertRunOk("chmod 666 /dev/net/tun") + self.assertRunOk("useradd -d /home/foo -m -s /bin/sh -u 1000 foo") + self.assertRunOk("touch /etc/subuid /etc/subgid") + self.assertRunOk("usermod --add-subuids 10000-75535 foo") + self.assertRunOk("usermod --add-subgids 10000-75535 foo") + # If /etc/resolv.conf is a symlink, it has to point either into /etc + # (or deep in there), or into /run (or deep in there), as only those + # would eventually get used by podman/netavark for # rootless containers. + # This is considered a workaround to the current situation; resolv,conf + # should ultimately be in /run rather than /tmp. + self.assertRunOk("mv /tmp/resolv.conf /run/resolv.conf") + self.assertRunOk("ln -sf /run/resolv.conf /etc/resolv.conf") + + # First, test podman as root (the current user) + self.do_podman() + + # Now, test podman as non-root. We need a bit of setup + # We need to use the same prompts for the user as used for root, so that the + # REPLWrapper still detects the prompts. This means it is going to be a bit + # difficut to directly see that it was a user that executed a command. + self.assertRunOk('su -s /usr/bin/env - foo PS1="${PS1}" PS2="${PS2}" /bin/sh') + output, _ = self.emulator.run("id -u") + self.assertEqual(output[0], "1000", "Could not switch to non-root") + self.do_podman() + + def do_podman(self): + # The podman binary is huge, so it takes time to load... + # Next calls will be faster, though, as it is going to be cached. + self.assertRunOk('podman --version') + + # Check for an empty image store + output, exit_code = self.emulator.run("podman image ls --format '{{ json }}'") + img_info = json.loads("".join(output)) + self.assertEqual(len(img_info), 0, f"{len(img_info)} image(s) already present") + + # Pull an image; it can take time: network, hash checksums... + self.assertRunOk('podman image pull busybox:1.37.0') + output, exit_code = self.emulator.run("podman image ls --format '{{ json }}'") + img_info = json.loads("".join(output)) + self.assertEqual(len(img_info), 1, f"{len(img_info)} image(s), expecting 1") + self.assertTrue("Id" in img_info[0], '"Id" not in img_info[0]') + self.assertTrue("Digest" in img_info[0], '"Digest" not in img_info[0]') + self.assertEqual(img_info[0]["Names"][0], "docker.io/library/busybox:1.37.0") + + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "", "Already in a container") + + # Spawn the container; that can take a bit of time + # Propagate the prompt so that the REPLWrapper detects it + self.assertRunOk( + "podman container run --rm -ti -e PS1 -e br_container=podman busybox:1.37.0", + ) + # Twist! The command above is still running, but the shell it + # started exposes the same prompt we expect. This is all what we want. + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "podman", "Not in a podman container") + + # Check that pid1 is the shell + output, _ = self.emulator.run('readlink /proc/1/exe') + self.assertEqual(output[0], "/bin/sh", f"PID1 is {output[0]}, should be /bin/sh") + + # Try to get something off the network + # Using http, not https, as busybox' wget does not do https + # Using --spider to just check we can reach the remote. + output, exit_code = self.emulator.run('wget --spider http://google.com/') + self.assertEqual(exit_code, 0, "wget did not succeed to reach google.com") + self.assertEqual(output[-1], "remote file exists", "wget did not succeed to reach google.com") + + # Exit the container + self.assertRunOk("exit 0") + # Twist, take two! We are now back to the shell in the VM. + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "", "Still in a container") + + # Spawn a container, round two, but with an injected init this time + self.assertRunOk( + "podman container run --rm -ti -e PS1 --init -e br_container=podman busybox:1.37.0", + ) + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "podman", "Not in a podman container") + + # Check that pid1 is the init injected by podman + output, _ = self.emulator.run('readlink /proc/1/exe') + self.assertEqual(output[0], "/run/podman-init", f"PID1 is {output[0]}, should be /run/podman-init") + + # Exit the container + self.assertRunOk("exit 0") + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "", "Still in a container") + + # Use an image from another registry, spawn without pulling first + self.assertRunOk( + "podman container run --rm -ti -e PS1 -e br_container=podman quay.io/prometheus/busybox:latest", + ) + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "podman", "Not in a podman container") + self.assertRunOk("exit 0") + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "", "Still in a container") + + # Remove the offical image + self.assertRunOk('podman image rm busybox:1.37.0') + output, _ = self.emulator.run("podman image ls --format '{{ json }}'") + img_info = json.loads("".join(output)) + # There is still one image(the unofficial one from quay.io) + self.assertEqual(len(img_info), 1, f"{len(img_info)} image(s) still present, expecting 1") + + # Remove all remaining images + self.assertRunOk('podman image prune -af') + output, exit_code = self.emulator.run("podman image ls --format '{{ json }}'") + img_info = json.loads("".join(output)) + self.assertEqual(len(img_info), 0, f"{len(img_info)} image(s) still present, expecting 0") + + +class TestPodmanIptables(PodmanBase): + def test_run(self): + self.do_test() + + +class TestPodmanNftables(PodmanBase): + config = PodmanBase.config + """ + BR2_PACKAGE_NFTABLES=y + """ + + def test_run(self): + self.do_test() + + +class TestPodmanTini(PodmanBase): + config = PodmanBase.config + """ + BR2_PACKAGE_PODMAN_INIT_TINI=y + """ + + def test_run(self): + self.do_test() From b36475315b974e1ac3120156745b55daf1b7557c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:09 +0100 Subject: [PATCH 85/88] package/aardvark-dns: new package aardvark-dns is needed by netavark to provide cross-container DNS resolving with Podman. It is to be noted that netavark and aardvark-dns have to be updated in lock-step [0]. Update the podman runtime test to validate this is working. [0] https://github.com/containers/podman/blob/main/DISTRO_PACKAGE.md#networking-tools-netavark-aardvark-dns-passt Signed-off-by: Yann E. MORIN Signed-off-by: Julien Olivain --- package/Config.in | 1 + package/aardvark-dns/Config.in | 9 +++++ package/aardvark-dns/aardvark-dns.hash | 3 ++ package/aardvark-dns/aardvark-dns.mk | 15 ++++++++ package/netavark/Config.in | 1 + package/netavark/netavark.mk | 1 + package/podman/podman.mk | 1 + support/testing/tests/package/test_podman.py | 38 ++++++++++++++++++++ 8 files changed, 69 insertions(+) create mode 100644 package/aardvark-dns/Config.in create mode 100644 package/aardvark-dns/aardvark-dns.hash create mode 100644 package/aardvark-dns/aardvark-dns.mk diff --git a/package/Config.in b/package/Config.in index 7e98256cdf..4297903fd8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2411,6 +2411,7 @@ menu "Miscellaneous" endmenu menu "Networking applications" + source "package/aardvark-dns/Config.in" source "package/aircrack-ng/Config.in" source "package/alfred/Config.in" source "package/aoetools/Config.in" diff --git a/package/aardvark-dns/Config.in b/package/aardvark-dns/Config.in new file mode 100644 index 0000000000..83ef5a16f9 --- /dev/null +++ b/package/aardvark-dns/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_AARDVARK_DNS + bool "aardvark-dns" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Authoritative dns server for A/AAAA container records. + Forwards other request to host's /etc/resolv.conf + + https://github.com/containers/aardvark-dns/ diff --git a/package/aardvark-dns/aardvark-dns.hash b/package/aardvark-dns/aardvark-dns.hash new file mode 100644 index 0000000000..5327a38b7e --- /dev/null +++ b/package/aardvark-dns/aardvark-dns.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 bbd4a0b0bdf6788c09266f1f944d5c5397b6db4f1da0735a1d42738a6e074249 aardvark-dns-v1.14.0-git4-cargo2.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/aardvark-dns/aardvark-dns.mk b/package/aardvark-dns/aardvark-dns.mk new file mode 100644 index 0000000000..a2e74a72bf --- /dev/null +++ b/package/aardvark-dns/aardvark-dns.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# aardvark-dns +# +################################################################################ + +# When updating the version here, also update netavark in lockstep +AARDVARK_DNS_VERSION = v1.14.0 +AARDVARK_DNS_SITE = https://github.com/containers/aardvark-dns +AARDVARK_DNS_SITE_METHOD = git + +AARDVARK_DNS_LICENSE = Apache-2.0 +AARDVARK_DNS_LICENSE_FILES = LICENSE + +$(eval $(cargo-package)) diff --git a/package/netavark/Config.in b/package/netavark/Config.in index cf7b731141..c78e57556f 100644 --- a/package/netavark/Config.in +++ b/package/netavark/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_NETAVARK bool "netavark" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_AARDVARK_DNS # runtime select BR2_PACKAGE_IPTABLES if !BR2_PACKAGE_NFTABLES # runtime select BR2_PACKAGE_NFTABLES_JSON if BR2_PACKAGE_NFTABLES && !BR2_PACKAGE_IPTABLES help diff --git a/package/netavark/netavark.mk b/package/netavark/netavark.mk index c96912ef5a..31d0b28b74 100644 --- a/package/netavark/netavark.mk +++ b/package/netavark/netavark.mk @@ -4,6 +4,7 @@ # ################################################################################ +# When updating the version here, also update aardvark-dns in lockstep NETAVARK_VERSION = v1.14.0 NETAVARK_SITE = https://github.com/containers/netavark NETAVARK_SITE_METHOD = git diff --git a/package/podman/podman.mk b/package/podman/podman.mk index 48b4cd9b27..29c5591a0a 100644 --- a/package/podman/podman.mk +++ b/package/podman/podman.mk @@ -101,6 +101,7 @@ PODMAN_POST_INSTALL_TARGET_HOOKS += PODMAN_CONFIG define PODMAN_HELPERS $(Q)mkdir -p $(TARGET_DIR)/usr/libexec/podman + $(Q)ln -sf ../../bin/aardvark-dns $(TARGET_DIR)/usr/libexec/podman/aardvark-dns $(Q)ln -sf ../../bin/netavark $(TARGET_DIR)/usr/libexec/podman/netavark $(Q)ln -sf ../../bin/slirp4netns $(TARGET_DIR)/usr/libexec/podman/slirp4netns $(PODMAN_HELPER_INIT) diff --git a/support/testing/tests/package/test_podman.py b/support/testing/tests/package/test_podman.py index e2b0598961..44211b438e 100644 --- a/support/testing/tests/package/test_podman.py +++ b/support/testing/tests/package/test_podman.py @@ -166,6 +166,44 @@ class PodmanBase(infra.basetest.BRTest): output, _ = self.emulator.run('echo ${br_container}') self.assertEqual(output[0], "", "Still in a container") + # Test networking between two containers + self.assertRunOk("podman network create buz") + self.assertRunOk( + "podman container run --rm -ti --name pod007 --network buz --detach busybox:1.37.0", + ) + self.assertRunOk( + "podman container run --rm -ti --name pod006 --network buz --detach busybox:1.37.0", + ) + # Ensure each pod can resolv itself and the other + # (not using itertools.matrix() just for those trivial combinations) + for pod1, pod2 in [ + ("pod006", "pod006"), + ("pod006", "pod007"), + ("pod007", "pod007"), + ("pod007", "pod006"), + ]: + output, exit_code = self.emulator.run( + f"podman container exec {pod1} nslookup {pod2}", + ) + self.assertEqual(exit_code, 0) + self.assertTrue(output[0].startswith("Server:")) + self.assertTrue(output[1].startswith("Address:")) + # Busybox' nslookup emits one "Non-authoritative answer" per + # supported address familly: IPv4 and IPv6. + self.assertEqual( + len([line for line in output[2:] if line == "Non-authoritative answer:"]), + 2, + ) + # But only IPv4 is available on this network + self.assertEqual( + len([line for line in output[2:] if line.startswith("Address:")]), + 1, + ) + self.assertRunOk("podman container kill --all") + output, _ = self.emulator.run("podman container ls --format '{{ json }}'") + pod_info = json.loads("".join(output)) + self.assertEqual(len(pod_info), 0, f"{len(pod_info)} container(s) still present, expecting 0") + # Remove the offical image self.assertRunOk('podman image rm busybox:1.37.0') output, _ = self.emulator.run("podman image ls --format '{{ json }}'") From d038cc47cdf8877a7062c18e04bb687f38fcd1e7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:10 +0100 Subject: [PATCH 86/88] package/passt: new package Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Julien Olivain --- package/Config.in | 1 + package/passt/Config.in | 19 +++++++++++++++++++ package/passt/passt.hash | 4 ++++ package/passt/passt.mk | 41 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 package/passt/Config.in create mode 100644 package/passt/passt.hash create mode 100644 package/passt/passt.mk diff --git a/package/Config.in b/package/Config.in index 4297903fd8..8a5c992626 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2606,6 +2606,7 @@ endif source "package/openvpn/Config.in" source "package/p910nd/Config.in" source "package/parprouted/Config.in" + source "package/passt/Config.in" source "package/phidgetwebservice/Config.in" source "package/phytool/Config.in" source "package/pimd/Config.in" diff --git a/package/passt/Config.in b/package/passt/Config.in new file mode 100644 index 0000000000..a2d2f4f1fe --- /dev/null +++ b/package/passt/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_PASST + bool "passt" + help + passt: Plug A Simple Socket Transport + pasta: Pack A Subtle Tap Abstraction + + passt implements a translation layer between a Layer-2 + network interface and native Layer-4 sockets (TCP, UDP, + ICMP/ICMPv6 echo) on a host. It doesn't require any + capabilities or privileges, and it can be used as a simple + replacement for Slirp. + + pasta (same binary as passt, different command) offers + equivalent functionality, for network namespaces: traffic + is forwarded using a tap interface inside the namespace, + without the need to create further interfaces on the host, + hence not requiring any capabilities or privileges. + + https://passt.top/passt/about/ diff --git a/package/passt/passt.hash b/package/passt/passt.hash new file mode 100644 index 0000000000..011ba84b89 --- /dev/null +++ b/package/passt/passt.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 f76c12e0535b9f6af59ee747d8ed7a8f691bb1ac7429225484788f0bc6e23dac passt-2025_02_17.a1e48a0-git4.tar.gz +sha256 32dfe03d9985f5feb581da26a2fe6c84530cccb6b53ede0d8dab075cd048ac5b LICENSES/BSD-3-Clause.txt +sha256 aaf135472f81c5b4a0dca9367e5bb5e9750032b5bebe5442b36e4c0a47430df3 LICENSES/GPL-2.0-or-later.txt diff --git a/package/passt/passt.mk b/package/passt/passt.mk new file mode 100644 index 0000000000..5b9fcd831f --- /dev/null +++ b/package/passt/passt.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# passt +# +################################################################################ + +PASST_VERSION = 2025_02_17.a1e48a0 +PASST_SITE = https://passt.top/passt +PASST_SITE_METHOD = git + +PASST_LICENSE = \ + BSD-3-Clause, \ + GPL-2.0-or-later +PASST_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GPL-2.0-or-later.txt + +define PASST_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_TUN) +endef + +define PASST_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) \ + prefix=/usr +endef + +define PASST_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) \ + prefix=/usr \ + DESTDIR=$(TARGET_DIR) \ + install +endef + +$(eval $(generic-package)) From 54f79d804f8fc78d1ebbc064b91adc6c26cf01cc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:11 +0100 Subject: [PATCH 87/88] package/podman: add option to use passt as network backend passt/pasta is the officially supported network backend, with slirp4netns only considered a legacy solution. However, some people have experienced corner cases when using passt/pasta (as it still is a young stack), so we do not want to do a blanket replace of slirp4netns just yet. Still, we make passt/pasta the default option. As a consequence, the existing runtime tests will now test passt/pasta, so we introduce two new tests for slirp4netns as a network backend. Signed-off-by: Yann E. MORIN Signed-off-by: Julien Olivain --- package/podman/Config.in | 22 +++++++++++++++----- package/podman/containers.conf | 2 -- package/podman/podman.mk | 19 +++++++++++++---- support/testing/tests/package/test_podman.py | 19 +++++++++++++++++ 4 files changed, 51 insertions(+), 11 deletions(-) delete mode 100644 package/podman/containers.conf diff --git a/package/podman/Config.in b/package/podman/Config.in index 41834052f4..4378d9918d 100644 --- a/package/podman/Config.in +++ b/package/podman/Config.in @@ -4,10 +4,10 @@ config BR2_PACKAGE_PODMAN depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # host-go depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # netavark depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme - depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp, slirp4netns - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp, slirp4netns - depends on BR2_TOOLCHAIN_HAS_THREADS # conmon, slirp4netns - depends on BR2_USE_WCHAR # conmon, slirp4netns + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp + depends on BR2_TOOLCHAIN_HAS_THREADS # conmon + depends on BR2_USE_WCHAR # conmon select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_CA_CERTIFICATES # runtime select BR2_PACKAGE_CGROUPFS_V2_MOUNT if !BR2_PACKAGE_CGROUPFS_MOUNT && !BR2_INIT_SYSTEMD # runtime @@ -22,7 +22,6 @@ config BR2_PACKAGE_PODMAN select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime select BR2_PACKAGE_SHADOW select BR2_PACKAGE_SHADOW_SUBORDINATE_IDS - select BR2_PACKAGE_SLIRP4NETNS # runtime help The best free & open source container tools @@ -67,6 +66,19 @@ config BR2_PACKAGE_PODMAN_INIT_NAME default "tini" if BR2_PACKAGE_PODMAN_INIT_TINI default "catatonit" if BR2_PACKAGE_PODMAN_INIT_CATATONIT +choice + bool "Network backend" + +config BR2_PACKAGE_PODMAN_NET_PASST + bool "passt/pasta" + select BR2_PACKAGE_PASST # runtime + +config BR2_PACKAGE_PODMAN_NET_SLIRP4NETNS + bool "slirp4netns" + select BR2_PACKAGE_SLIRP4NETNS # runtime + +endchoice + endif comment "podman needs a toolchain w/ headers >= 3.17, threads, wchar" diff --git a/package/podman/containers.conf b/package/podman/containers.conf deleted file mode 100644 index 1db48c1905..0000000000 --- a/package/podman/containers.conf +++ /dev/null @@ -1,2 +0,0 @@ -[network] -default_rootless_network_cmd = "slirp4netns" diff --git a/package/podman/podman.mk b/package/podman/podman.mk index 29c5591a0a..7ca9b9ddcb 100644 --- a/package/podman/podman.mk +++ b/package/podman/podman.mk @@ -62,6 +62,19 @@ define PODMAN_HELPER_INIT endef endif +ifeq ($(BR2_PACKAGE_PODMAN_NET_PASST),y) +define PODMAN_HELPER_PASST + $(Q)ln -sf ../../bin/pasta $(TARGET_DIR)/usr/libexec/podman/pasta +endef +else +define PODMAN_HELPER_SLIRP4NETNS + $(Q)ln -sf ../../bin/slirp4netns $(TARGET_DIR)/usr/libexec/podman/slirp4netns + $(Q)mkdir -p $(TARGET_DIR)/etc/containers/containers.conf.d + $(Q)printf '[network]\ndefault_rootless_network_cmd = "slirp4netns"\n' \ + >$(TARGET_DIR)/etc/containers/containers.conf.d/50-buildroot-net-backend.conf +endef +endif + define PODMAN_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) $(call KCONFIG_ENABLE_OPT,CONFIG_BPF_SYSCALL) @@ -87,9 +100,6 @@ define PODMAN_LINUX_CONFIG_FIXUPS endef define PODMAN_CONFIG - $(Q)$(INSTALL) -D -m 0644 \ - $(PODMAN_PKGDIR)/containers.conf \ - $(TARGET_DIR)/usr/share/containers/containers.conf $(Q)$(INSTALL) -D -m 0644 \ $(PODMAN_PKGDIR)/policy.json \ $(TARGET_DIR)/etc/containers/policy.json @@ -103,8 +113,9 @@ define PODMAN_HELPERS $(Q)mkdir -p $(TARGET_DIR)/usr/libexec/podman $(Q)ln -sf ../../bin/aardvark-dns $(TARGET_DIR)/usr/libexec/podman/aardvark-dns $(Q)ln -sf ../../bin/netavark $(TARGET_DIR)/usr/libexec/podman/netavark - $(Q)ln -sf ../../bin/slirp4netns $(TARGET_DIR)/usr/libexec/podman/slirp4netns $(PODMAN_HELPER_INIT) + $(PODMAN_HELPER_PASST) + $(PODMAN_HELPER_SLIRP4NETNS) endef PODMAN_POST_INSTALL_TARGET_HOOKS += PODMAN_HELPERS diff --git a/support/testing/tests/package/test_podman.py b/support/testing/tests/package/test_podman.py index 44211b438e..4d9b19310e 100644 --- a/support/testing/tests/package/test_podman.py +++ b/support/testing/tests/package/test_podman.py @@ -239,3 +239,22 @@ class TestPodmanTini(PodmanBase): def test_run(self): self.do_test() + + +class TestPodmanSlirpIptables(PodmanBase): + config = PodmanBase.config + """ + BR2_PACKAGE_PODMAN_NET_SLIRP4NETNS=y + """ + + def test_run(self): + self.do_test() + + +class TestPodmanSlirpNftables(PodmanBase): + config = PodmanBase.config + """ + BR2_PACKAGE_NFTABLES=y + BR2_PACKAGE_PODMAN_NET_SLIRP4NETNS=y + """ + + def test_run(self): + self.do_test() From 3a2baca4b785db33175058741f6123dfef85df84 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Mar 2025 20:57:12 +0100 Subject: [PATCH 88/88] system/skeleton: move target of /etc/resolv.conf symlink In commit ba70f94e629e (subversion makes it so we do not need a separate tarball to store empty directories and symlinks for the target_skeleton.) /etc/resolv.conf was made a symlink to ../tmp/resolv.conf. There was no rationale behind this change, but back at the time (2006!), the only location that Buildroot guaranteed to be writable was /tmp, and we needed a writable location to create resolv.conf from a DHCP reply for example, so the change made sense. Commits 2f67d9e2fe7b (preparation for BR2_PACKAGE_BUSYBOX_SKELETON), in 2007, then d9119c0bc55d (move default skeleton to fs/ and drop busybox skeleton), in 2010, and finally 6c3e3ad41977 (New top-level directory: system), in 2012, propagated that /etc/resolv.conf without any change in the target of the symlink. However, since commit d380dde1d287 (skeleton: make /run a proper directory/filesystem), in 2015, a tmpfs has been mounted on /run, so it is now guaranteed to be writable as well for SYS-V-based systems. That has also been the case for openrc since commit a840e485d174 (package/skeleton-init-openrc: new package), in 2019. This has also always been the case for systemd as well. resolv.conf is not a temporary file [0]; it is really more of a runtime data; its location in /tmp is just a historical artefact of a long-wrong assertion. Nowadays, distributions either have an actual file as /etc/resolv.conf (when /etc is writable), or it is a symlink to a location below /run. Although resolv.conf is used by the C library resolver, a lot of applications now will directly use it; this is the case for some container management tools, such as podman (and its helpers, like netavark), that expect /etc/resolv.conf to either be a file or a symlink to somewhere in /run, and fail to provide DNS services if that is not the case. So, we move the target of /etc/resolv.conf to ../run/resolv.conf. As a consequence, we can drop the workaround in podman's runtime test. To be noted: there are tow custom fstab files in Buildroot that do not explicitly mount a tmpfs on /run: - one for a systemd runtime test, so /run would also be a tmpfs there anyway, as systemd does mount one; - one for the mender_x86_64_efi_defconfig; that's a not a problem: / is an ext4 that is mounted r/w (and /tmp is not a tmpfs either, so the symlink to /tmp would not not have worked if / was not r/w anyway). This leaves people with their own fstab, to adapt. Cater to them by adding a little blurb in the documentation. Note: the following 43 tests all built and ran successfully: tests.init tests.package.test_apache tests.package.test_docker_compose tests.package.test_dropbear tests.package.test_iputils tests.package.test_podman tests.package.test_skopeo tests.package.test_wget (no other runtime test were attempted) [0] temporary, as in relatively short-lived. Signed-off-by: Yann E. MORIN Signed-off-by: Julien Olivain --- docs/manual/migrating.adoc | 14 ++++++++++++++ support/testing/tests/package/test_podman.py | 7 ------- system/skeleton/etc/resolv.conf | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/docs/manual/migrating.adoc b/docs/manual/migrating.adoc index 5e8c3ea2c6..1b55bc6173 100644 --- a/docs/manual/migrating.adoc +++ b/docs/manual/migrating.adoc @@ -195,3 +195,17 @@ host-mender-artifact. See +board/mender/x86_64/post-image-efi.sh+ for an example of how to generate the bootstrap.mender file. See https://docs.mender.io/release-information/release-notes-changelog/mender-client#mender-3-5-0-1[the release notes], under features, for more information. + +[[migrating-resolv.conf]] +=== Migrating to 2025.05 + +In 2025.05, for SYS-V-like systems (busybox, sysvinit, openrc), the +`/etc/resolv.conf` symlink was changed to point to `/run/resolv.conf`, +rather than the legacy location in `/tmp`. Users of a custom `fstab` +will need to ensure that `/run` is writable before resolv.conf is +created (usually by a DHCP client), either with an entry for `/run`, +or with a startup script. + +Note that systems using systemd are not impacted: systemd always ensures +that `/run` is writable. Systems further using systemd-resolved already +had a `/etc/resolv.conf` that pointed into `/run` anyway. diff --git a/support/testing/tests/package/test_podman.py b/support/testing/tests/package/test_podman.py index 4d9b19310e..9d86a06129 100644 --- a/support/testing/tests/package/test_podman.py +++ b/support/testing/tests/package/test_podman.py @@ -71,13 +71,6 @@ class PodmanBase(infra.basetest.BRTest): self.assertRunOk("touch /etc/subuid /etc/subgid") self.assertRunOk("usermod --add-subuids 10000-75535 foo") self.assertRunOk("usermod --add-subgids 10000-75535 foo") - # If /etc/resolv.conf is a symlink, it has to point either into /etc - # (or deep in there), or into /run (or deep in there), as only those - # would eventually get used by podman/netavark for # rootless containers. - # This is considered a workaround to the current situation; resolv,conf - # should ultimately be in /run rather than /tmp. - self.assertRunOk("mv /tmp/resolv.conf /run/resolv.conf") - self.assertRunOk("ln -sf /run/resolv.conf /etc/resolv.conf") # First, test podman as root (the current user) self.do_podman() diff --git a/system/skeleton/etc/resolv.conf b/system/skeleton/etc/resolv.conf index 71f6f96576..2ce2910f08 120000 --- a/system/skeleton/etc/resolv.conf +++ b/system/skeleton/etc/resolv.conf @@ -1 +1 @@ -../tmp/resolv.conf \ No newline at end of file +../run/resolv.conf \ No newline at end of file