diff --git a/.checkpackageignore b/.checkpackageignore index 66b3e100bb..e38d576a20 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 @@ -621,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 @@ -1050,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/Config.in.legacy b/Config.in.legacy index 44ee749329..298476f495 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_SQLITE_ENABLE_JSON1 diff --git a/DEVELOPERS b/DEVELOPERS index 1f04dd2a1e..0c6d7532f8 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 @@ -2054,6 +2055,11 @@ F: package/libodb-mysql/ 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 F: package/irqbalance/ F: package/openvmtools/ 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/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/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/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/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/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/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/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/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/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/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/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/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/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 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 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 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 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 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 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 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 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 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 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 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 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 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" 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 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/linux/Config.in b/linux/Config.in index dc6c5d384f..506eccf0ed 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.19" 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 \ diff --git a/linux/linux.hash b/linux/linux.hash index 8d1f3700e2..b85cad7c3c 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 d73bf057bec04434b169d1b61641936f7d0c97ceb923a281f32e35dd4dcc6531 linux-6.12.19.tar.xz sha256 894bbbe63b7484a0bc576a1e11a8dbc090fbd476d6424431bdc8435e03c2c208 linux-6.6.83.tar.xz sha256 44caf510603b4cbbe78ef828620099d200536d666e909ddb73bb2938c7de5b16 linux-6.1.131.tar.xz diff --git a/package/Config.in b/package/Config.in index 4a81a62ec4..8a5c992626 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" @@ -2410,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" @@ -2559,6 +2561,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" @@ -2603,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" @@ -2808,6 +2812,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" @@ -2866,6 +2871,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" @@ -2892,6 +2898,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/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/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)) 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 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 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)) 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 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 ba4e7a4ae0..c39dc2b440 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -35,6 +35,16 @@ DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif +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/$(DOCKER_ENGINE_INIT_NAME) \ + $(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/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 = \ 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 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 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 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) 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 0a7ee3c298..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,30 +4,33 @@ # ################################################################################ +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 $(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)) 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 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 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 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) 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 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 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) 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/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 533f56a992..a9d912f6cc 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -59,7 +59,18 @@ 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) +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)) 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)) 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 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 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+ 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+ 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 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 diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 432d5d1749..eff20e9846 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.131" if BR2_KERNEL_HEADERS_6_1 default "6.6.83" if BR2_KERNEL_HEADERS_6_6 default "6.12.19" 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/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) diff --git a/package/netavark/Config.in b/package/netavark/Config.in new file mode 100644 index 0000000000..c78e57556f --- /dev/null +++ b/package/netavark/Config.in @@ -0,0 +1,13 @@ +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 + 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..31d0b28b74 --- /dev/null +++ b/package/netavark/netavark.mk @@ -0,0 +1,93 @@ +################################################################################ +# +# netavark +# +################################################################################ + +# 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 + +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)) 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 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/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..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 @@ -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 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 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)) diff --git a/package/podman/Config.in b/package/podman/Config.in new file mode 100644 index 0000000000..4378d9918d --- /dev/null +++ b/package/podman/Config.in @@ -0,0 +1,92 @@ +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 + 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 + 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 + 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 + +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" + 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/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..7ca9b9ddcb --- /dev/null +++ b/package/podman/podman.mk @@ -0,0 +1,122 @@ +################################################################################ +# +# 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 + +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) + $(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)/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/aardvark-dns $(TARGET_DIR)/usr/libexec/podman/aardvark-dns + $(Q)ln -sf ../../bin/netavark $(TARGET_DIR)/usr/libexec/podman/netavark + $(PODMAN_HELPER_INIT) + $(PODMAN_HELPER_PASST) + $(PODMAN_HELPER_SLIRP4NETNS) +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/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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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..c598ad88fd 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 @@ -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 - - - - - 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)) 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/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..5923957c25 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 @@ -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)) 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 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. 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 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 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', 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) 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 + } +} diff --git a/support/testing/tests/package/test_podman.py b/support/testing/tests/package/test_podman.py new file mode 100644 index 0000000000..9d86a06129 --- /dev/null +++ b/support/testing/tests/package/test_podman.py @@ -0,0 +1,253 @@ +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") + + # 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") + + # 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 }}'") + 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() + + +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() 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") 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 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 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